diff options
| author | Magnus Damm <damm@opensource.se> | 2011-01-12 11:43:07 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-13 07:22:04 +0100 |
| commit | ceb50f33d478ca42baf72257381a923c797b418b (patch) | |
| tree | ad417c904c890ef0584ae82939f69afba4b6f8e5 | |
| parent | Merge branch 'rmobile/sdio' into rmobile-latest (diff) | |
| download | linux-ceb50f33d478ca42baf72257381a923c797b418b.tar.xz linux-ceb50f33d478ca42baf72257381a923c797b418b.zip | |
ARM: mach-shmobile: Kill off unused !gpio_is_valid() case
The Card Detect GPIOs used on AP4EVB and Mackerel are
alwayws valid, so kill off the unused !gpio_is_valid()
case.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index f888d9d1d010..712e43318286 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c @@ -247,10 +247,7 @@ static struct platform_device smc911x_device = { */ static int slot_cn7_get_cd(struct platform_device *pdev) { - if (gpio_is_valid(GPIO_PORT41)) - return !gpio_get_value(GPIO_PORT41); - else - return -ENXIO; + return !gpio_get_value(GPIO_PORT41); } /* SH_MMCIF */ diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index ad7e14aba164..7b15d21f0f68 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -657,10 +657,7 @@ static struct platform_device fsi_ak4643_device = { */ static int slot_cn7_get_cd(struct platform_device *pdev) { - if (gpio_is_valid(GPIO_PORT41)) - return !gpio_get_value(GPIO_PORT41); - else - return -ENXIO; + return !gpio_get_value(GPIO_PORT41); } /* SDHI0 */ |