Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5649d8f9 authored by Fabio Baltieri's avatar Fabio Baltieri Committed by Samuel Ortiz
Browse files

mfd: ab8500-sysctrl: Let sysctrl driver work without pdata 



A check for a valid plat->sysctrl was introduced in:

2377e52f mfd: ab8500-sysctrl: Error check clean up

but the driver works just fine even without that initialization data,
and enforcing it breaks existing platforms for no reason.

This patch removes the check and let the driver go ahead with probe.

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarFabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent e9d7b4b5

drivers/mfd/ab8500-sysctrl.c

+2 −3
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ void ab8500_restart(char mode, const char *cmd) 


	plat = dev_get_platdata(sysctrl_dev->parent);

	pdata = plat->sysctrl;

	if (pdata->reboot_reason_code)

	if (pdata && pdata->reboot_reason_code)

		reason = pdata->reboot_reason_code(cmd);

	else

		pr_warn("[%s] No reboot reason set. Default reason %d\n",
@@ -188,7 +188,7 @@ static int ab8500_sysctrl_probe(struct platform_device *pdev) 


	plat = dev_get_platdata(pdev->dev.parent);



	if (!(plat && plat->sysctrl))

	if (!plat)

		return -EINVAL;



	sysctrl_dev = &pdev->dev;
@@ -197,7 +197,6 @@ static int ab8500_sysctrl_probe(struct platform_device *pdev) 
		pm_power_off = ab8500_power_off;



	pdata = plat->sysctrl;



	if (pdata) {

		int last, ret, i, j;