Skip to content

Commit

Permalink
leds: leds-fsg: use devm_ioremap
Browse files Browse the repository at this point in the history
The devm_ functions allocate memory that is released when a driver
detaches. This patch uses devm_ioremap() for these functions.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
  • Loading branch information
Jingoo Han authored and Bryan Wu committed Nov 26, 2012
1 parent b0053aa commit aa2dcf9
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions drivers/leds/leds-fsg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}

Expand Down

0 comments on commit aa2dcf9

Please sign in to comment.