Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux

[~andy/linux] / drivers / staging / sbe-2t3e3 / io.c

diff --git a/drivers/staging/sbe-2t3e3/io.c b/drivers/staging/sbe-2t3e3/io.c
index 9a50bcc59594c50eebca92b3bfa822bf774b9070..c9947b165b31396a71684a09031d3a0a8a34d0fc 100644 (file)
--- a/drivers/staging/sbe-2t3e3/io.c
+++ b/drivers/staging/sbe-2t3e3/io.c
@@ -17,7 +17,7 @@
 /* All access to registers done via the 21143 on port 0 must be
  * protected via the card->bootrom_lock. */
 
-/* priviate define to be used here only - must be protected by card->bootrom_lock */
+/* private define to be used here only - must be protected by card->bootrom_lock */
 #define cpld_write_nolock(channel, reg, val)                   \
        bootrom_write((channel), CPLD_MAP_REG(reg, channel), val)
 
@@ -199,15 +199,6 @@ u32 exar7250_read(struct channel *channel, u32 reg)
        u32 result;
        unsigned long flags;
 
-#if 0
-       switch (reg) {
-       case SBE_2T3E3_FRAMER_REG_OPERATING_MODE:
-               return channel->framer_regs[reg];
-               break;
-       default:
-       }
-#endif
-
        spin_lock_irqsave(&channel->card->bootrom_lock, flags);
 
        result = bootrom_read(channel, cpld_reg_map[SBE_2T3E3_CPLD_REG_FRAMER_BASE_ADDRESS]
@@ -243,18 +234,6 @@ u32 exar7300_read(struct channel *channel, u32 reg)
        unsigned long addr = channel->card->bootrom_addr, flags;
        u32 i, val;
 
-#if 0
-       switch (reg) {
-       case SBE_2T3E3_LIU_REG_REG1:
-       case SBE_2T3E3_LIU_REG_REG2:
-       case SBE_2T3E3_LIU_REG_REG3:
-       case SBE_2T3E3_LIU_REG_REG4:
-               return channel->liu_regs[reg];
-               break;
-       default:
-       }
-#endif
-
        /* select correct Serial Chip */
 
        spin_lock_irqsave(&channel->card->bootrom_lock, flags);