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-palmz71.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-palmz71.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmz71.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index 1b7d3580d148..801fb5f62ed7 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c | |||
@@ -326,14 +326,14 @@ palmz71_gpio_setup(int early) | |||
326 | gpio_direction_output(1, 1); | 326 | gpio_direction_output(1, 1); |
327 | } else { | 327 | } else { |
328 | /* Set MMC/SD host WP pin as input */ | 328 | /* Set MMC/SD host WP pin as input */ |
329 | if (omap_request_gpio(PALMZ71_MMC_WP_GPIO)) { | 329 | if (gpio_request(PALMZ71_MMC_WP_GPIO, "MMC WP") < 0) { |
330 | printk(KERN_ERR "Could not reserve WP GPIO!\n"); | 330 | printk(KERN_ERR "Could not reserve WP GPIO!\n"); |
331 | return; | 331 | return; |
332 | } | 332 | } |
333 | gpio_direction_input(PALMZ71_MMC_WP_GPIO); | 333 | gpio_direction_input(PALMZ71_MMC_WP_GPIO); |
334 | 334 | ||
335 | /* Monitor the Power-cable-connected signal */ | 335 | /* Monitor the Power-cable-connected signal */ |
336 | if (omap_request_gpio(PALMZ71_USBDETECT_GPIO)) { | 336 | if (gpio_request(PALMZ71_USBDETECT_GPIO, "USB detect") < 0) { |
337 | printk(KERN_ERR | 337 | printk(KERN_ERR |
338 | "Could not reserve cable signal GPIO!\n"); | 338 | "Could not reserve cable signal GPIO!\n"); |
339 | return; | 339 | return; |