TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ab8500: Clean up probe routines

Browse Source 
These patches clean up some ugliness and brings the variable
initialisation formatting more into line with other drivers.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
This commit is contained in:
Lee Jones
2012-05-05 04:38:19 -07:00
committed by Anton Vorontsov
parent 5f98eb393c
commit 2aac3de19b
3 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/power/ab8500_btemp.c
+10 -6
View File
@@ -964,10 +964,15 @@ static int __devinit ab8500_btemp_probe(struct platform_device *pdev)
{ {
int irq, i, ret = 0; int irq, i, ret = 0;
u8 val; u8 val;
struct abx500_bm_plat_data *plat_data; struct abx500_bm_plat_data *plat_data = pdev->dev.platform_data;
struct ab8500_btemp *di;
struct ab8500_btemp *di = if (!plat_data) {
kzalloc(sizeof(struct ab8500_btemp), GFP_KERNEL); dev_err(&pdev->dev, "No platform data\n");
return -EINVAL;
}
di = kzalloc(sizeof(*di), GFP_KERNEL);
if (!di) if (!di)
return -ENOMEM; return -ENOMEM;
@@ -977,13 +982,12 @@ static int __devinit ab8500_btemp_probe(struct platform_device *pdev)
di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0");
/* get btemp specific platform data */ /* get btemp specific platform data */
plat_data = pdev->dev.platform_data; di->pdata = plat_data->btemp;
if (!plat_data || !plat_data->btemp) { if (!di->pdata) {
dev_err(di->dev, "no btemp platform data supplied\n"); dev_err(di->dev, "no btemp platform data supplied\n");
ret = -EINVAL; ret = -EINVAL;
goto free_device_info; goto free_device_info;
} }
di->pdata = plat_data->btemp;
/* get battery specific platform data */ /* get battery specific platform data */
di->bat = plat_data->battery; di->bat = plat_data->battery;
drivers/power/ab8500_charger.c
+10 -6
View File
@@ -2534,10 +2534,15 @@ static int __devexit ab8500_charger_remove(struct platform_device *pdev)
static int __devinit ab8500_charger_probe(struct platform_device *pdev) static int __devinit ab8500_charger_probe(struct platform_device *pdev)
{ {
int irq, i, charger_status, ret = 0; int irq, i, charger_status, ret = 0;
struct abx500_bm_plat_data *plat_data; struct abx500_bm_plat_data *plat_data = pdev->dev.platform_data;
struct ab8500_charger *di;
struct ab8500_charger *di = if (!plat_data) {
kzalloc(sizeof(struct ab8500_charger), GFP_KERNEL); dev_err(&pdev->dev, "No platform data\n");
return -EINVAL;
}
di = kzalloc(sizeof(*di), GFP_KERNEL);
if (!di) if (!di)
return -ENOMEM; return -ENOMEM;
@@ -2550,13 +2555,12 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
spin_lock_init(&di->usb_state.usb_lock); spin_lock_init(&di->usb_state.usb_lock);
/* get charger specific platform data */ /* get charger specific platform data */
plat_data = pdev->dev.platform_data; di->pdata = plat_data->charger;
if (!plat_data || !plat_data->charger) { if (!di->pdata) {
dev_err(di->dev, "no charger platform data supplied\n"); dev_err(di->dev, "no charger platform data supplied\n");
ret = -EINVAL; ret = -EINVAL;
goto free_device_info; goto free_device_info;
} }
di->pdata = plat_data->charger;
/* get battery specific platform data */ /* get battery specific platform data */
di->bat = plat_data->battery; di->bat = plat_data->battery;
drivers/power/ab8500_fg.c
+10 -6
View File
@@ -2446,10 +2446,15 @@ static int __devinit ab8500_fg_probe(struct platform_device *pdev)
{ {
int i, irq; int i, irq;
int ret = 0; int ret = 0;
struct abx500_bm_plat_data *plat_data; struct abx500_bm_plat_data *plat_data = pdev->dev.platform_data;
struct ab8500_fg *di;
struct ab8500_fg *di = if (!plat_data) {
kzalloc(sizeof(struct ab8500_fg), GFP_KERNEL); dev_err(&pdev->dev, "No platform data\n");
return -EINVAL;
}
di = kzalloc(sizeof(*di), GFP_KERNEL);
if (!di) if (!di)
return -ENOMEM; return -ENOMEM;
@@ -2461,13 +2466,12 @@ static int __devinit ab8500_fg_probe(struct platform_device *pdev)
di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0");
/* get fg specific platform data */ /* get fg specific platform data */
plat_data = pdev->dev.platform_data; di->pdata = plat_data->fg;
if (!plat_data || !plat_data->fg) { if (!di->pdata) {
dev_err(di->dev, "no fg platform data supplied\n"); dev_err(di->dev, "no fg platform data supplied\n");
ret = -EINVAL; ret = -EINVAL;
goto free_device_info; goto free_device_info;
} }
di->pdata = plat_data->fg;
/* get battery specific platform data */ /* get battery specific platform data */
di->bat = plat_data->battery; di->bat = plat_data->battery;