mfd: sm501: fix mismatches of request_mem_region
PATCH 1/1 mfd: sm501: fix mismatches of request_mem_region
This driver misuses release_resource + kfree to match request_mem_region, which is incorrect.
The right way is to use release_mem_region.
Replace the mismatched calls with the right ones to fix it.
--- drivers/mfd/sm501.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
drivers/mfd/sm501.c +7 -12
@@ -1086,8 +1086,7 @@ static int sm501_register_gpio(struct sm501_devdata *sm)iounmap (gpio->regs); err_claimed: -release_resource (gpio->regs_res); -kfree (gpio->regs_res); +release_mem_region (iobase,0x20 );return ret; }
@@ -1095,6 +1094,7 @@ static int sm501_register_gpio(struct sm501_devdata *sm)static void sm501_gpio_remove (struct sm501_devdata *sm) {struct sm501_gpio *gpio = &sm->gpio; +resource_size_t iobase = sm->io_res->start +SM501_GPIO ;if (!sm->gpio.registered)return ;
@@ -1103,8 +1103,7 @@ static void sm501_gpio_remove(struct sm501_devdata *sm)gpiochip_remove (&gpio->high.gpio);iounmap (gpio->regs); -release_resource (gpio->regs_res); -kfree (gpio->regs_res); +release_mem_region (iobase,0x20 ); }static inline int sm501_gpio_isregistered (struct sm501_devdata *sm)
@@ -1427,8 +1426,7 @@ static int sm501_plat_probe(struct platform_device *dev)return sm501_init_dev (sm); err_claim: -release_resource (sm->regs_claim); -kfree (sm->regs_claim); +release_mem_region (sm->io_res->start,0x100 ); err_res:kfree (sm); err1:
@@ -1637,8 +1635,7 @@ static int sm501_pci_probe(struct pci_dev *dev,return 0 ; err4: -release_resource (sm->regs_claim); -kfree (sm->regs_claim); +release_mem_region (sm->io_res->start,0x100 ); err3:pci_disable_device (dev); err2:
@@ -1673,8 +1670,7 @@ static void sm501_pci_remove(struct pci_dev *dev)sm501_dev_remove (sm);iounmap (sm->regs); -release_resource (sm->regs_claim); -kfree (sm->regs_claim); +release_mem_region (sm->io_res->start,0x100 );pci_disable_device (dev); }
@@ -1686,8 +1682,7 @@ static int sm501_plat_remove(struct platform_device *dev)sm501_dev_remove (sm);iounmap (sm->regs); -release_resource (sm->regs_claim); -kfree (sm->regs_claim); +release_mem_region (sm->io_res->start,0x100 );return 0 ; }
Signature · 1 line
2.24.0
Quoted 25 lines · Chuhong Yuan
This driver misuses
release_resource+ kfree to matchrequest_mem_region, which is incorrect.
The right way is to userelease_mem_region.
Replace the mismatched calls with the right ones to fix it.Signed-off-by Chuhong Yuan <[email protected]>--- drivers/mfd/sm501.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)drivers/mfd/sm501.c +1
-2@@ -1086,8 +1086,7 @@ static int sm501_register_gpio(struct sm501_devdata *sm)iounmap (gpio->regs); err_claimed: -release_resource (gpio->regs_res); -kfree (gpio->regs_res); +release_mem_region (iobase,0x20 );return ret; }
drivers/mfd/sm501.c static int sm501_register_gpio(struct sm501_devdata *sm) · line 1097
Quoted 4 lines
drivers/mfd/sm501.c +1
-0@@ -1095,6 +1094,7 @@ static int sm501_register_gpio(struct sm501_devdata *sm)static void sm501_gpio_remove (struct sm501_devdata *sm) {struct sm501_gpio *gpio = &sm->gpio; +resource_size_t iobase = sm->io_res->start +SM501_GPIO ;
Shouldn't this be 'struct resource *'?
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Quoted 25 lines · Lee Jones
Quoted 22 lines · Chuhong Yuan
This driver misuses
release_resource+ kfree to matchrequest_mem_region, which is incorrect.
The right way is to userelease_mem_region.
Replace the mismatched calls with the right ones to fix it.Signed-off-by Chuhong Yuan <[email protected]>--- drivers/mfd/sm501.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)drivers/mfd/sm501.c +1
-2@@ -1086,8 +1086,7 @@ static int sm501_register_gpio(struct sm501_devdata *sm)iounmap (gpio->regs); err_claimed: -release_resource (gpio->regs_res); -kfree (gpio->regs_res); +release_mem_region (iobase,0x20 );
Quoted 10 lines
drivers/mfd/sm501.c static int sm501_register_gpio(struct sm501_devdata *sm) · line 1097
Quoted 7 lines
drivers/mfd/sm501.c +1
-0return ret; }@@ -1095,6 +1094,7 @@ static int sm501_register_gpio(struct sm501_devdata *sm)static void sm501_gpio_remove (struct sm501_devdata *sm) {struct sm501_gpio *gpio = &sm->gpio; +resource_size_t iobase = sm->io_res->start +SM501_GPIO ;Shouldn't this be 'struct resource *'?
sm501_register_gpio() uses resource_size_t, so I use the same type in remove.
Quoted 5 lines
--
Lee Jones [李琼斯]
Linaro Services Technical LeadLinaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Quoted 36 lines · Chuhong Yuan
Quoted 25 lines · Lee Jones
Quoted 22 lines · Chuhong Yuan
This driver misuses
release_resource+ kfree to matchrequest_mem_region, which is incorrect.
The right way is to userelease_mem_region.
Replace the mismatched calls with the right ones to fix it.Signed-off-by Chuhong Yuan <[email protected]>--- drivers/mfd/sm501.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)drivers/mfd/sm501.c +1
-2@@ -1086,8 +1086,7 @@ static int sm501_register_gpio(struct sm501_devdata *sm)iounmap (gpio->regs); err_claimed: -release_resource (gpio->regs_res); -kfree (gpio->regs_res); +release_mem_region (iobase,0x20 );Quoted 9 lines
drivers/mfd/sm501.c static int sm501_register_gpio(struct sm501_devdata *sm) · line 1097
Quoted 7 lines
drivers/mfd/sm501.c +1
-0return ret; }@@ -1095,6 +1094,7 @@ static int sm501_register_gpio(struct sm501_devdata *sm)static void sm501_gpio_remove (struct sm501_devdata *sm) {struct sm501_gpio *gpio = &sm->gpio; +resource_size_t iobase = sm->io_res->start +SM501_GPIO ;Shouldn't this be 'struct resource *'?
Quoted 1 line
sm501_register_gpio()usesresource_size_t, so I use the same type in remove.
Okay. Just for the record, there are a few things I don't like about this patch, but seeing as it's inline with the current coding style, I will accept it based on the fact that it would be unreasonable to ask for the driver to be bought back into line as a prerequisite for acceptance.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Lee Jones
AppliedQuoted 9 lines · Chuhong Yuan
This driver misuses
release_resource+ kfree to matchrequest_mem_region, which is incorrect.
The right way is to userelease_mem_region.
Replace the mismatched calls with the right ones to fix it.Signed-off-by Chuhong Yuan <[email protected]>--- drivers/mfd/sm501.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog