ARMV7: OMAP: I2C driver: Restructure i2c_write_byte function

[u-boot] / drivers / pcmcia / tqm8xx_pcmcia.c

diff --git a/drivers/pcmcia/tqm8xx_pcmcia.c b/drivers/pcmcia/tqm8xx_pcmcia.c
index 6ba8b5c01ffd03da4b64dc82df5ebb05aec87d22..ca1a9fe151d15fad7d21823cbf27291ab99328af 100644 (file)
--- a/drivers/pcmcia/tqm8xx_pcmcia.c
+++ b/drivers/pcmcia/tqm8xx_pcmcia.c
@@ -36,39 +36,6 @@
 #define        power_on_5_0(slot)      do {} while (0)
 #define        power_on_3_3(slot)      do {} while (0)
 
-#elif  defined(CONFIG_HMI10)
-
-static inline void power_config(int slot)
-{
-       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
-       /*
-        * Configure Port B  pins for
-        * 5 Volts Enable and 3 Volts enable
-       */
-       immap->im_cpm.cp_pbpar &= ~(0x00000300);
-}
-
-static inline void power_off(int slot)
-{
-       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
-       /* remove all power */
-       immap->im_cpm.cp_pbdat |= 0x00000300;
-}
-
-static inline void power_on_5_0(int slot)
-{
-       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
-       immap->im_cpm.cp_pbdat &= ~(0x0000100);
-       immap->im_cpm.cp_pbdir |= 0x00000300;
-}
-
-static inline void power_on_3_3(int slot)
-{
-       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
-       immap->im_cpm.cp_pbdat &= ~(0x0000200);
-       immap->im_cpm.cp_pbdir |= 0x00000300;
-}
-
 #elif  defined(CONFIG_VIRTLAB2)
 
 #define        power_config(slot)      do {} while (0)
@@ -128,21 +95,12 @@ static inline void power_on_3_3(int slot)
 
 #endif
 
-#ifdef CONFIG_HMI10
-static inline int check_card_is_absent(int slot)
-{
-       volatile pcmconf8xx_t *pcmp =
-               (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
-       return pcmp->pcmc_pipr & (0x10000000 >> (slot << 4));
-}
-#else
 static inline int check_card_is_absent(int slot)
 {
        volatile pcmconf8xx_t *pcmp =
                (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
        return pcmp->pcmc_pipr & (0x18000000 >> (slot << 4));
 }
-#endif
 
 #ifdef NSCU_OE_INV
 #define        NSCU_GCRX_CXOE  0