From 5456831a40de199f536cdacbec973620ead271ac Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 10 May 2012 00:41:02 +0100 Subject: [PATCH] --- yaml --- r: 302228 b: refs/heads/master c: b7ca87884b138f27f042dd32bd16e9a9f295da77 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/wm831x-dcdc.c | 18 ++++++------------ trunk/drivers/regulator/wm831x-ldo.c | 18 ++++++------------ 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/[refs] b/[refs] index 2f04776eb9dc..cb76eacba772 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c006b21f7fec8d5fe256011f29f14065cf26aefc +refs/heads/master: b7ca87884b138f27f042dd32bd16e9a9f295da77 diff --git a/trunk/drivers/regulator/wm831x-dcdc.c b/trunk/drivers/regulator/wm831x-dcdc.c index 3de56f5e0f7d..318b9631155c 100644 --- a/trunk/drivers/regulator/wm831x-dcdc.c +++ b/trunk/drivers/regulator/wm831x-dcdc.c @@ -477,9 +477,6 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "Probing DCDC%d\n", id + 1); - if (pdata == NULL || pdata->dcdc[id] == NULL) - return -ENODEV; - dcdc = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_dcdc), GFP_KERNEL); if (dcdc == NULL) { @@ -525,7 +522,8 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev) wm831x_buckv_dvs_init(dcdc, pdata->dcdc[id]->driver_data); config.dev = pdev->dev.parent; - config.init_data = pdata->dcdc[id]; + if (pdata) + config.init_data = pdata->dcdc[id]; config.driver_data = dcdc; config.regmap = wm831x->regmap; @@ -680,9 +678,6 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "Probing DCDC%d\n", id + 1); - if (pdata == NULL || pdata->dcdc[id] == NULL) - return -ENODEV; - dcdc = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_dcdc), GFP_KERNEL); if (dcdc == NULL) { @@ -713,7 +708,8 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev) dcdc->desc.enable_mask = 1 << id; config.dev = pdev->dev.parent; - config.init_data = pdata->dcdc[id]; + if (pdata) + config.init_data = pdata->dcdc[id]; config.driver_data = dcdc; config.regmap = wm831x->regmap; @@ -925,9 +921,6 @@ static __devinit int wm831x_epe_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "Probing EPE%d\n", id + 1); - if (pdata == NULL || pdata->epe[id] == NULL) - return -ENODEV; - dcdc = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_dcdc), GFP_KERNEL); if (dcdc == NULL) { dev_err(&pdev->dev, "Unable to allocate private data\n"); @@ -949,7 +942,8 @@ static __devinit int wm831x_epe_probe(struct platform_device *pdev) dcdc->desc.enable_mask = 1 << dcdc->desc.id; config.dev = pdev->dev.parent; - config.init_data = pdata->epe[id]; + if (pdata) + config.init_data = pdata->epe[id]; config.driver_data = dcdc; config.regmap = wm831x->regmap; diff --git a/trunk/drivers/regulator/wm831x-ldo.c b/trunk/drivers/regulator/wm831x-ldo.c index 932eff845207..74cd1f24b892 100644 --- a/trunk/drivers/regulator/wm831x-ldo.c +++ b/trunk/drivers/regulator/wm831x-ldo.c @@ -273,9 +273,6 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1); - if (pdata == NULL || pdata->ldo[id] == NULL) - return -ENODEV; - ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL); if (ldo == NULL) { dev_err(&pdev->dev, "Unable to allocate private data\n"); @@ -305,7 +302,8 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev) ldo->desc.enable_mask = 1 << id; config.dev = pdev->dev.parent; - config.init_data = pdata->ldo[id]; + if (pdata) + config.init_data = pdata->ldo[id]; config.driver_data = ldo; config.regmap = wm831x->regmap; @@ -531,9 +529,6 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1); - if (pdata == NULL || pdata->ldo[id] == NULL) - return -ENODEV; - ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL); if (ldo == NULL) { dev_err(&pdev->dev, "Unable to allocate private data\n"); @@ -563,7 +558,8 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev) ldo->desc.enable_mask = 1 << id; config.dev = pdev->dev.parent; - config.init_data = pdata->ldo[id]; + if (pdata) + config.init_data = pdata->ldo[id]; config.driver_data = ldo; config.regmap = wm831x->regmap; @@ -719,9 +715,6 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1); - if (pdata == NULL || pdata->ldo[id] == NULL) - return -ENODEV; - ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ldo), GFP_KERNEL); if (ldo == NULL) { dev_err(&pdev->dev, "Unable to allocate private data\n"); @@ -751,7 +744,8 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev) ldo->desc.enable_mask = 1 << id; config.dev = pdev->dev.parent; - config.init_data = pdata->ldo[id]; + if (pdata) + config.init_data = pdata->ldo[id]; config.driver_data = ldo; config.regmap = wm831x->regmap;