Remove unused card_detect(), and make card_detect_target() static inline in each sd driver.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23757 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 11 insertions, 16 deletions

diff --git a/firmware/target/arm/s3c2440/sd-s3c2440.c b/firmware/target/arm/s3c2440/sd-s3c2440.c
index 6213cbd003..8aa53d8891 100644
--- a/firmware/target/arm/s3c2440/sd-s3c2440.c
+++ b/firmware/target/arm/s3c2440/sd-s3c2440.c
@@ -494,6 +494,17 @@ static int sd_init_card(const int card_no)
     Generic functions
  *****************************************************************************/
 
+static inline bool card_detect_target(void)
+{
+    /* TODO - use interrupt on change? */
+#ifdef MINI2440
+    return (GPGDAT & SD_CD) == 0;
+#else
+#error Unsupported target
+#endif
+}
+
+
 /*****************************************************************************/
 #ifdef HAVE_HOTSWAP
 
@@ -512,16 +523,6 @@ static int sd1_oneshot_callback(struct timeout *tmo)
     return 0;
 }
 
-bool card_detect_target(void)
-{
-    /* TODO - use interrupt on change? */
-#ifdef MINI2440
-    return (GPGDAT & SD_CD) == 0;
-#else
-#error Unsupported target
-#endif
-}
-
 void card_enable_monitoring_target(bool on)
 {
     if (on)
@@ -570,12 +571,6 @@ bool sd_present(IF_MD_NONVOID(int card_no))
 /*****************************************************************************/
 #else
 
-bool card_detect_target(void)
-{
-    /* not applicable */
-    return false;
-}
-
 bool sd_removable(IF_MD_NONVOID(int card_no))
 {
 #ifndef HAVE_MULTIDRIVE