On Tue, Oct 23, 2012 at 5:19 AM, Jingoo Han <jg1.han@xxxxxxxxxxx> wrote:
> The devm_ functions allocate memory that is released when a driver
> detaches. This patch uses devm_ioremap() for these functions.
>
Looks fine, I will push to for-next.
Thanks,
-Bryan
> Signed-off-by: Jingoo Han <jg1.han@xxxxxxxxxxx>
> ---
> drivers/leds/leds-fsg.c | 15 +++++----------
> 1 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c
> index b9053fa..b4d5a44 100644
> --- a/drivers/leds/leds-fsg.c
> +++ b/drivers/leds/leds-fsg.c
> @@ -20,8 +20,8 @@
> #include <linux/platform_device.h>
> #include <linux/leds.h>
> #include <linux/module.h>
> +#include <linux/io.h>
> #include <mach/hardware.h>
> -#include <asm/io.h>
>
> #define FSG_LED_WLAN_BIT 0
> #define FSG_LED_WAN_BIT 1
> @@ -149,11 +149,10 @@ static int fsg_led_probe(struct platform_device *pdev)
> int ret;
>
> /* Map the LED chip select address space */
> - latch_address = (unsigned short *) ioremap(IXP4XX_EXP_BUS_BASE(2), 512);
> - if (!latch_address) {
> - ret = -ENOMEM;
> - goto failremap;
> - }
> + latch_address = (unsigned short *) devm_ioremap(&pdev->dev,
> + IXP4XX_EXP_BUS_BASE(2), 512);
> + if (!latch_address)
> + return -ENOMEM;
>
> latch_value = 0xffff;
> *latch_address = latch_value;
> @@ -195,8 +194,6 @@ static int fsg_led_probe(struct platform_device *pdev)
> failwan:
> led_classdev_unregister(&fsg_wlan_led);
> failwlan:
> - iounmap(latch_address);
> - failremap:
>
> return ret;
> }
> @@ -210,8 +207,6 @@ static int fsg_led_remove(struct platform_device *pdev)
> led_classdev_unregister(&fsg_sync_led);
> led_classdev_unregister(&fsg_ring_led);
>
> - iounmap(latch_address);
> -
> return 0;
> }
>
> --
> 1.7.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-leds" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
