Commit 51f83ef0 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regulator-v3.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "More changes than I'd like here, most of them for a single bug
  repeated in a bunch of drivers with data not being initialized
  correctly, plus a fix to lower the severity of a warning introduced in
  the last merge window which can legitimately go off so we don't want
  to alarm users excessively"

* tag 'regulator-v3.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: s2mpa01: zero-initialize regulator match table array
  regulator: max8660: zero-initialize regulator match table array
  regulator: max77802: zero-initialize regulator match table
  regulator: max77686: zero-initialize regulator match table
  regulator: max1586: zero-initialize regulator match table array
  regulator: max77693: Fix use of uninitialized regulator config
  regulator: of: Lower the severity of the error with no container
parents 1395b9cf 2a7509b1
...@@ -163,7 +163,7 @@ static int of_get_max1586_platform_data(struct device *dev, ...@@ -163,7 +163,7 @@ static int of_get_max1586_platform_data(struct device *dev,
struct max1586_platform_data *pdata) struct max1586_platform_data *pdata)
{ {
struct max1586_subdev_data *sub; struct max1586_subdev_data *sub;
struct of_regulator_match rmatch[ARRAY_SIZE(max1586_reg)]; struct of_regulator_match rmatch[ARRAY_SIZE(max1586_reg)] = { };
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
int i, matched; int i, matched;
......
...@@ -395,7 +395,7 @@ static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev, ...@@ -395,7 +395,7 @@ static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev,
struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent); struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct device_node *pmic_np, *regulators_np; struct device_node *pmic_np, *regulators_np;
struct max77686_regulator_data *rdata; struct max77686_regulator_data *rdata;
struct of_regulator_match rmatch; struct of_regulator_match rmatch = { };
unsigned int i; unsigned int i;
pmic_np = iodev->dev->of_node; pmic_np = iodev->dev->of_node;
......
...@@ -227,7 +227,7 @@ static int max77693_pmic_probe(struct platform_device *pdev) ...@@ -227,7 +227,7 @@ static int max77693_pmic_probe(struct platform_device *pdev)
struct max77693_dev *iodev = dev_get_drvdata(pdev->dev.parent); struct max77693_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct max77693_regulator_data *rdata = NULL; struct max77693_regulator_data *rdata = NULL;
int num_rdata, i; int num_rdata, i;
struct regulator_config config; struct regulator_config config = { };
num_rdata = max77693_pmic_init_rdata(&pdev->dev, &rdata); num_rdata = max77693_pmic_init_rdata(&pdev->dev, &rdata);
if (!rdata || num_rdata <= 0) { if (!rdata || num_rdata <= 0) {
......
...@@ -454,7 +454,7 @@ static int max77802_pmic_dt_parse_pdata(struct platform_device *pdev, ...@@ -454,7 +454,7 @@ static int max77802_pmic_dt_parse_pdata(struct platform_device *pdev,
struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent); struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct device_node *pmic_np, *regulators_np; struct device_node *pmic_np, *regulators_np;
struct max77686_regulator_data *rdata; struct max77686_regulator_data *rdata;
struct of_regulator_match rmatch; struct of_regulator_match rmatch = { };
unsigned int i; unsigned int i;
pmic_np = iodev->dev->of_node; pmic_np = iodev->dev->of_node;
......
...@@ -335,7 +335,7 @@ static int max8660_pdata_from_dt(struct device *dev, ...@@ -335,7 +335,7 @@ static int max8660_pdata_from_dt(struct device *dev,
int matched, i; int matched, i;
struct device_node *np; struct device_node *np;
struct max8660_subdev_data *sub; struct max8660_subdev_data *sub;
struct of_regulator_match rmatch[ARRAY_SIZE(max8660_reg)]; struct of_regulator_match rmatch[ARRAY_SIZE(max8660_reg)] = { };
np = of_get_child_by_name(dev->of_node, "regulators"); np = of_get_child_by_name(dev->of_node, "regulators");
if (!np) { if (!np) {
......
...@@ -211,7 +211,8 @@ struct regulator_init_data *regulator_of_get_init_data(struct device *dev, ...@@ -211,7 +211,8 @@ struct regulator_init_data *regulator_of_get_init_data(struct device *dev,
search = dev->of_node; search = dev->of_node;
if (!search) { if (!search) {
dev_err(dev, "Failed to find regulator container node\n"); dev_dbg(dev, "Failed to find regulator container node '%s'\n",
desc->regulators_node);
return NULL; return NULL;
} }
......
...@@ -341,7 +341,7 @@ static int s2mpa01_pmic_probe(struct platform_device *pdev) ...@@ -341,7 +341,7 @@ static int s2mpa01_pmic_probe(struct platform_device *pdev)
{ {
struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent); struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct sec_platform_data *pdata = dev_get_platdata(iodev->dev); struct sec_platform_data *pdata = dev_get_platdata(iodev->dev);
struct of_regulator_match rdata[S2MPA01_REGULATOR_MAX]; struct of_regulator_match rdata[S2MPA01_REGULATOR_MAX] = { };
struct device_node *reg_np = NULL; struct device_node *reg_np = NULL;
struct regulator_config config = { }; struct regulator_config config = { };
struct s2mpa01_info *s2mpa01; struct s2mpa01_info *s2mpa01;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment