evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mfd: 88pm800: Enhance sub devices initialization

Browse source 
Separate the devices initialization into different functions.
It makes the probe function clearer.

Signed-off-by: Chao Xie <chao.xie@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Chao Xie 2013-06-14 01:21:52 -04:00 • committed by Samuel Ortiz
parent 03dcc544bf
commit 3a3ece5415
1 changed files with 41 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
drivers/mfd/88pm800.c
View file

@ -305,6 +305,40 @@ out:
return ret; return ret;
} }
static int device_onkey_init(struct pm80x_chip *chip,
struct pm80x_platform_data *pdata)
{
int ret;
ret = mfd_add_devices(chip->dev, 0, &onkey_devs[0],
ARRAY_SIZE(onkey_devs), &onkey_resources[0], 0,
NULL);
if (ret) {
dev_err(chip->dev, "Failed to add onkey subdev\n");
return ret;
}
return 0;
}
static int device_rtc_init(struct pm80x_chip *chip,
struct pm80x_platform_data *pdata)
{
int ret;
rtc_devs[0].platform_data = pdata->rtc;
rtc_devs[0].pdata_size =
pdata->rtc ? sizeof(struct pm80x_rtc_pdata) : 0;
ret = mfd_add_devices(chip->dev, 0, &rtc_devs[0],
ARRAY_SIZE(rtc_devs), NULL, 0, NULL);
if (ret) {
dev_err(chip->dev, "Failed to add rtc subdev\n");
return ret;
}
return 0;
}
static int device_irq_init_800(struct pm80x_chip *chip) static int device_irq_init_800(struct pm80x_chip *chip)
{ {
struct regmap *map = chip->regmap; struct regmap *map = chip->regmap;
@ -454,27 +488,16 @@ static int device_800_init(struct pm80x_chip *chip,
goto out; goto out;
} }
ret = ret = device_onkey_init(chip, pdata);
mfd_add_devices(chip->dev, 0, &onkey_devs[0], if (ret) {
ARRAY_SIZE(onkey_devs), &onkey_resources[0], 0,
NULL);
if (ret < 0) {
dev_err(chip->dev, "Failed to add onkey subdev\n"); dev_err(chip->dev, "Failed to add onkey subdev\n");
goto out_dev; goto out_dev;
} else }
dev_info(chip->dev, "[%s]:Added mfd onkey_devs\n", __func__);
if (pdata && pdata->rtc) { ret = device_rtc_init(chip, pdata);
rtc_devs[0].platform_data = pdata->rtc; if (ret) {
rtc_devs[0].pdata_size = sizeof(struct pm80x_rtc_pdata);
ret = mfd_add_devices(chip->dev, 0, &rtc_devs[0],
ARRAY_SIZE(rtc_devs), NULL, 0, NULL);
if (ret < 0) {
dev_err(chip->dev, "Failed to add rtc subdev\n"); dev_err(chip->dev, "Failed to add rtc subdev\n");
goto out_dev; goto out;
} else
dev_info(chip->dev,
"[%s]:Added mfd rtc_devs\n", __func__);
} }
return 0; return 0;