dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

leds: leds-fsg: use devm_ioremap 

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>
This commit is contained in:
Jingoo Han 2012-10-23 05:19:41 -07:00 committed by Bryan Wu
parent b0053aaa23
commit aa2dcf9dc1
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/leds/leds-fsg.c
View File

@ -20,8 +20,8 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/io.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/io.h>
#define FSG_LED_WLAN_BIT 0 #define FSG_LED_WLAN_BIT 0
#define FSG_LED_WAN_BIT 1 #define FSG_LED_WAN_BIT 1
@ -149,11 +149,10 @@ static int fsg_led_probe(struct platform_device *pdev)
int ret; int ret;
/* Map the LED chip select address space */ /* Map the LED chip select address space */
latch_address = (unsigned short *) ioremap(IXP4XX_EXP_BUS_BASE(2), 512); latch_address = (unsigned short *) devm_ioremap(&pdev->dev,
if (!latch_address) { IXP4XX_EXP_BUS_BASE(2), 512);
ret = -ENOMEM; if (!latch_address)
goto failremap; return -ENOMEM;
}
latch_value = 0xffff; latch_value = 0xffff;
*latch_address = latch_value; *latch_address = latch_value;
@ -195,8 +194,6 @@ static int fsg_led_probe(struct platform_device *pdev)
failwan: failwan:
led_classdev_unregister(&fsg_wlan_led); led_classdev_unregister(&fsg_wlan_led);
failwlan: failwlan:
iounmap(latch_address);
failremap:
return ret; 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_sync_led);
led_classdev_unregister(&fsg_ring_led); led_classdev_unregister(&fsg_ring_led);
iounmap(latch_address);
return 0; return 0;
} }