diff options
author | Jarkko Nikula <jarkko.nikula@nokia.com> | 2008-12-10 20:35:30 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-12-10 20:35:30 -0500 |
commit | f2d18fea8b87d09bdda22cc67c36f5f463452a33 (patch) | |
tree | a8641626136a6f14d2873e13f263fa0de6ab04f8 /arch/arm/mach-omap1/board-palmte.c | |
parent | e031ab23deb5a5d9ac5744e69a0627823e81b074 (diff) |
ARM: OMAP: Switch to gpio_request/free calls
Switch to gpio_request/free calls
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-palmte.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmte.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 0995a0fc1dd0..4141e3917d7c 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
@@ -347,14 +347,14 @@ static void palmte_headphones_detect(void *data, int state) | |||
347 | static void __init palmte_misc_gpio_setup(void) | 347 | static void __init palmte_misc_gpio_setup(void) |
348 | { | 348 | { |
349 | /* Set TSC2102 PINTDAV pin as input (used by TSC2102 driver) */ | 349 | /* Set TSC2102 PINTDAV pin as input (used by TSC2102 driver) */ |
350 | if (omap_request_gpio(PALMTE_PINTDAV_GPIO)) { | 350 | if (gpio_request(PALMTE_PINTDAV_GPIO, "TSC2102 PINTDAV") < 0) { |
351 | printk(KERN_ERR "Could not reserve PINTDAV GPIO!\n"); | 351 | printk(KERN_ERR "Could not reserve PINTDAV GPIO!\n"); |
352 | return; | 352 | return; |
353 | } | 353 | } |
354 | gpio_direction_input(PALMTE_PINTDAV_GPIO); | 354 | gpio_direction_input(PALMTE_PINTDAV_GPIO); |
355 | 355 | ||
356 | /* Set USB-or-DC-IN pin as input (unused) */ | 356 | /* Set USB-or-DC-IN pin as input (unused) */ |
357 | if (omap_request_gpio(PALMTE_USB_OR_DC_GPIO)) { | 357 | if (gpio_request(PALMTE_USB_OR_DC_GPIO, "USB/DC-IN") < 0) { |
358 | printk(KERN_ERR "Could not reserve cable signal GPIO!\n"); | 358 | printk(KERN_ERR "Could not reserve cable signal GPIO!\n"); |
359 | return; | 359 | return; |
360 | } | 360 | } |