diff options
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/i82365.c | 6 | ||||
-rw-r--r-- | drivers/pcmcia/tqm8xx_pcmcia.c | 15 |
2 files changed, 13 insertions, 8 deletions
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c index 1bcb3a5..1cde83a 100644 --- a/drivers/pcmcia/i82365.c +++ b/drivers/pcmcia/i82365.c @@ -272,11 +272,7 @@ static u_int cirrus_set_opts (socket_info_t * s) { cirrus_state_t *p = &s->c_state; u_int mask = 0xffff; -#if DEBUG - char buf[200]; - - memset (buf, 0, 200); -#endif + char buf[200] = {0}; if (has_ring == -1) has_ring = 1; diff --git a/drivers/pcmcia/tqm8xx_pcmcia.c b/drivers/pcmcia/tqm8xx_pcmcia.c index 859cbe0..dda7d37 100644 --- a/drivers/pcmcia/tqm8xx_pcmcia.c +++ b/drivers/pcmcia/tqm8xx_pcmcia.c @@ -43,19 +43,28 @@ static inline void power_config(int slot) {} static inline void power_off(int slot) { - out_be32(PCMCIA_CTRL, 0); + volatile unsigned __iomem *addr; + addr = (volatile unsigned __iomem *)PCMCIA_CTRL; + + out_be32(addr, 0); } static inline void power_on_5_0(int slot) { + volatile unsigned __iomem *addr; + addr = (volatile unsigned __iomem *)PCMCIA_CTRL; + /* Enable 5V Vccout */ - out_be32(PCMCIA_CTRL, 2); + out_be32(addr, 2); } static inline void power_on_3_3(int slot) { + volatile unsigned __iomem *addr; + addr = (volatile unsigned __iomem *)PCMCIA_CTRL; + /* Enable 3.3V Vccout */ - out_be32(PCMCIA_CTRL, 1); + out_be32(addr, 1); } #else |