Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[cascardo/linux.git] / drivers / net / s2io.h

diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 2d14497..800b3a4 100644 (file)
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -893,9 +893,6 @@ struct s2io_nic {
        u16 all_multi_pos;
        u16 promisc_flg;
 
-       /*  Id timer, used to blink NIC to physically identify NIC. */
-       struct timer_list id_timer;
-
        /*  Restart timer, used to restart NIC if the device is stuck and
         *  a schedule task that will set the correct Link state once the
         *  NIC's PHY has stabilized after a state change.
@@ -1005,18 +1002,16 @@ static inline void writeq(u64 val, void __iomem *addr)
 #define LF     2
 static inline void SPECIAL_REG_WRITE(u64 val, void __iomem *addr, int order)
 {
-       u32 ret;
-
        if (order == LF) {
                writel((u32) (val), addr);
-               ret = readl(addr);
+               (void) readl(addr);
                writel((u32) (val >> 32), (addr + 4));
-               ret = readl(addr + 4);
+               (void) readl(addr + 4);
        } else {
                writel((u32) (val >> 32), (addr + 4));
-               ret = readl(addr + 4);
+               (void) readl(addr + 4);
                writel((u32) (val), addr);
-               ret = readl(addr);
+               (void) readl(addr);
        }
 }