2013-05-15 15:01:01

by Leon Romanovsky

Subject: [PATCH] drivers: mfd: sec-core: Remove explicit call to mfd_remove_devices

In case mfd_add_devices will fail, it will call to mfd_remove_devices
by itself and return non-zero value.

Signed-off-by: Leon Romanovsky <[email protected]>
---
drivers/mfd/sec-core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index 5b740a3..c93ed3d 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -230,13 +230,12 @@ static int sec_pmic_probe(struct i2c_client *i2c,
BUG();
}

- if (ret < 0)
+ if (ret)
goto err;

return ret;

err:
- mfd_remove_devices(sec_pmic->dev);
sec_irq_exit(sec_pmic);
i2c_unregister_device(sec_pmic->rtc);
return ret;
--
1.8.1.5

2013-05-16 22:13:38

by Samuel Ortiz

Subject: Re: [PATCH] drivers: mfd: sec-core: Remove explicit call to mfd_remove_devices

Hi Leon,

On Wed, May 15, 2013 at 06:00:48PM +0300, Leon Romanovsky wrote:
> In case mfd_add_devices will fail, it will call to mfd_remove_devices
> by itself and return non-zero value.
>
> Signed-off-by: Leon Romanovsky <[email protected]>
> ---
> drivers/mfd/sec-core.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
Applied to mfd-next, thanks.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/