mfd: palmas: fix the resource leak issue and cleanups.
Subsystems (2)
cover mfd: palmas: fix the resource leak issue and cleanups.
This series does the:
- removing non-require api calls.
- Fix the resource leaks.
- reset the initialisation done in probing.
Laxman Dewangan (4):
mfd: palmas: remove call of mfd_remove_devices
mfd: palmas: add MODULE_DEVICE_TABLE for of_device table
mfd: palmas: reset pm_power_off if it is set for the device
mfd: palmas: fix resource leak of i2c_dummy devices
drivers/mfd/palmas.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-)
PATCH 1/4 mfd: palmas: remove call of mfd_remove_devices
The driver only support the device tree and sub modules are populated through platform, the registration of sub devices through mfd_add_devices has been removed.
Hence in remove path of the driver, it is not require to call mfd_remove_devices.
--- drivers/mfd/palmas.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/mfd/palmas.c +0 -1
@@ -567,7 +567,6 @@ static int palmas_i2c_remove(struct i2c_client *i2c) {struct palmas *palmas =i2c_get_clientdata (i2c); -mfd_remove_devices (palmas->dev);regmap_del_irq_chip (palmas->irq, palmas->irq_data);return 0 ;
Signature · 1 line
1.7.1.1
Lee Jones
AppliedRe: [PATCH 1/4] mfd: palmas: remove call of mfd_remove_devices
Quoted 11 lines · Laxman Dewangan
The driver only support the device tree and sub modules are populated through platform, the registration of sub devices through
mfd_add_deviceshas been removed.Hence in remove path of the driver, it is not require to call
mfd_remove_devices.Signed-off-by Laxman Dewangan <[email protected]>--- drivers/mfd/palmas.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH 2/4 mfd: palmas: add MODULE_DEVICE_TABLE for of_device table
In reply to Laxman Dewangan--- drivers/mfd/palmas.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/mfd/palmas.c +1 -0
@@ -368,6 +368,7 @@ static const struct of_device_id of_palmas_match_tbl[] = { }, { }, }; +MODULE_DEVICE_TABLE (of, of_palmas_match_tbl);static int palmas_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id)
Signature · 1 line
1.7.1.1
Lee Jones
AppliedRe: [PATCH 2/4] mfd: palmas: add MODULE_DEVICE_TABLE for of_device table
drivers/mfd/palmas.c
Quoted 6 lines · Laxman Dewangan
Signed-off-by Laxman Dewangan <[email protected]>--- drivers/mfd/palmas.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)drivers/mfd/palmas.c +0
-0
Applied, thanks.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH 3/4 mfd: palmas: reset pm_power_off if it is set for the device
In reply to Laxman DewanganIf Palams supports the system power controller and pm_power_off is implemented through the Palmas driver then reset the pm_power_off in driver remove.
This will avoid the call of Palmas driver after removal of driver.
--- drivers/mfd/palmas.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/mfd/palmas.c +5 -0
@@ -570,6 +570,11 @@ static int palmas_i2c_remove(struct i2c_client *i2c)regmap_del_irq_chip (palmas->irq, palmas->irq_data); +if (palmas == palmas_dev) { + pm_power_off =NULL ; + palmas_dev =NULL ; + } +return 0 ; }
Signature · 1 line
1.7.1.1
Re: [PATCH 3/4] mfd: palmas: reset pm_power_off if it is set for the device
Quoted 10 lines · Laxman Dewangan
If Palams supports the system power controller and
pm_power_offis implemented through the Palmas driver then reset thepm_power_offin driver remove.This will avoid the call of Palmas driver after removal of driver.
Signed-off-by Laxman Dewangan <[email protected]>--- drivers/mfd/palmas.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
Looks good. Applied, thanks.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH 4/4 mfd: palmas: fix resource leak of i2c_dummy devices
In reply to Laxman DewanganPalmas device supports multiple i2c device address and the client for these addressed are created in the driver as i2c_new_dummy().
The new devices are not getting released in error or removal path and so it is causing resource leak.
Add the unregister of these newly created dummy devices to avoid resource leaks.
--- drivers/mfd/palmas.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)
drivers/mfd/palmas.c +15 -6
@@ -422,7 +422,7 @@ static int palmas_i2c_probe(struct i2c_client *i2c,dev_err (palmas->dev,"can't attach client %d\n" , i); ret = -ENOMEM ; - goto err; + goto err_i2c; } palmas->i2c_clients[i]->dev.of_node =of_node_get (node); }
@@ -433,7 +433,7 @@ static int palmas_i2c_probe(struct i2c_client *i2c,dev_err (palmas->dev,"Failed to allocate regmap %d, err: %d\n" , i, ret); - goto err; + goto err_i2c; } }
@@ -452,7 +452,7 @@ static int palmas_i2c_probe(struct i2c_client *i2c, reg);if (ret <0 ) {dev_err (palmas->dev,"POLARITY_CTRL updat failed: %d\n" , ret); - goto err; + goto err_i2c; }/* Change IRQ into clear on read mode for efficiency */
@@ -466,7 +466,7 @@ static int palmas_i2c_probe(struct i2c_client *i2c,IRQF_ONESHOT | pdata->irq_flags,0 , &palmas_irq_chip, &palmas->irq_data);if (ret <0 ) - goto err; + goto err_i2c; no_irq: slave =PALMAS_BASE_TO_SLAVE (PALMAS_PU_PD_OD_BASE );
@@ -552,7 +552,6 @@ no_irq: }else if (pdata->pm_off && !pm_power_off) { palmas_dev = palmas; pm_power_off = palmas_power_off; -return ret; } }
@@ -560,16 +559,26 @@ no_irq: err_irq:regmap_del_irq_chip (palmas->irq, palmas->irq_data); -err: +err_i2c: +for (i =1 ; i <PALMAS_NUM_CLIENTS ; i++) { +if (palmas->i2c_clients[i]) +i2c_unregister_device (palmas->i2c_clients[i]); + }return ret; }static int palmas_i2c_remove (struct i2c_client *i2c) {struct palmas *palmas =i2c_get_clientdata (i2c); +int i;regmap_del_irq_chip (palmas->irq, palmas->irq_data); +for (i =1 ; i <PALMAS_NUM_CLIENTS ; i++) { +if (palmas->i2c_clients[i]) +i2c_unregister_device (palmas->i2c_clients[i]); + } +if (palmas == palmas_dev) { pm_power_off =NULL ; palmas_dev =NULL ;
Signature · 1 line
1.7.1.1
Lee Jones
AppliedRe: [PATCH 4/4] mfd: palmas: fix resource leak of i2c_dummy devices
Quoted 6 lines · Laxman Dewangan
Palmas device supports multiple i2c device address and the client for these addressed are created in the driver as
i2c_new_dummy().The new devices are not getting released in error or removal path and so it is causing resource leak.
Quoted 7 lines
Add the unregister of these newly created dummy devices to avoid resource leaks.
Signed-off-by Laxman Dewangan <[email protected]>--- drivers/mfd/palmas.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)
Patch looks sane.
drivers/mfd/palmas.c no_irq: · line 556
Quoted 9 lines
no_irq:drivers/mfd/palmas.c +0
-1slave =PALMAS_BASE_TO_SLAVE (PALMAS_PU_PD_OD_BASE );@@ -552,7 +552,6 @@ no_irq: }else if (pdata->pm_off && !pm_power_off) { palmas_dev = palmas; pm_power_off = palmas_power_off; -return ret; } }
Sneaky! ;)
Applied, thanks.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog