diff options
-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 f888d9d1d01..712e4331828 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 = { | |||
247 | */ | 247 | */ |
248 | static int slot_cn7_get_cd(struct platform_device *pdev) | 248 | static int slot_cn7_get_cd(struct platform_device *pdev) |
249 | { | 249 | { |
250 | if (gpio_is_valid(GPIO_PORT41)) | 250 | return !gpio_get_value(GPIO_PORT41); |
251 | return !gpio_get_value(GPIO_PORT41); | ||
252 | else | ||
253 | return -ENXIO; | ||
254 | } | 251 | } |
255 | 252 | ||
256 | /* SH_MMCIF */ | 253 | /* SH_MMCIF */ |
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index ad7e14aba16..7b15d21f0f6 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 = { | |||
657 | */ | 657 | */ |
658 | static int slot_cn7_get_cd(struct platform_device *pdev) | 658 | static int slot_cn7_get_cd(struct platform_device *pdev) |
659 | { | 659 | { |
660 | if (gpio_is_valid(GPIO_PORT41)) | 660 | return !gpio_get_value(GPIO_PORT41); |
661 | return !gpio_get_value(GPIO_PORT41); | ||
662 | else | ||
663 | return -ENXIO; | ||
664 | } | 661 | } |
665 | 662 | ||
666 | /* SDHI0 */ | 663 | /* SDHI0 */ |