Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

[~andy/linux] / arch / arm / mach-s3c24xx / mach-mini2440.c

diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
index 5d66fb218a41bcb121c5845e201009ffe0a0bbab..bd6d2525debef34a3d6e8752912bcb26da6cf52f 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-mini2440.c
+++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
@@ -292,21 +292,10 @@ static struct s3c2410_platform_nand mini2440_nand_info __initdata = {
 /* DM9000AEP 10/100 ethernet controller */
 
 static struct resource mini2440_dm9k_resource[] = {
-       [0] = {
-               .start = MACH_MINI2440_DM9K_BASE,
-               .end   = MACH_MINI2440_DM9K_BASE + 3,
-               .flags = IORESOURCE_MEM
-       },
-       [1] = {
-               .start = MACH_MINI2440_DM9K_BASE + 4,
-               .end   = MACH_MINI2440_DM9K_BASE + 7,
-               .flags = IORESOURCE_MEM
-       },
-       [2] = {
-               .start = IRQ_EINT7,
-               .end   = IRQ_EINT7,
-               .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
-       }
+       [0] = DEFINE_RES_MEM(MACH_MINI2440_DM9K_BASE, 4),
+       [1] = DEFINE_RES_MEM(MACH_MINI2440_DM9K_BASE + 4, 4),
+       [2] = DEFINE_RES_NAMED(IRQ_EINT7, 1, NULL, IORESOURCE_IRQ \
+                                               | IORESOURCE_IRQ_HIGHEDGE),
 };
 
 /*
@@ -645,8 +634,8 @@ static void __init mini2440_init(void)
        s3c_gpio_cfgpin(S3C2410_GPC(0), S3C2410_GPC0_LEND);
 
        /* Turn the backlight early on */
-       WARN_ON(gpio_request(S3C2410_GPG(4), "backlight"));
-       gpio_direction_output(S3C2410_GPG(4), 1);
+       WARN_ON(gpio_request_one(S3C2410_GPG(4), GPIOF_OUT_INIT_HIGH, NULL));
+       gpio_free(S3C2410_GPG(4));
 
        /* remove pullup on optional PWM backlight -- unused on 3.5 and 7"s */
        s3c_gpio_setpull(S3C2410_GPB(1), S3C_GPIO_PULL_UP);