]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net: seeq: fix timer conversion
authorArnd Bergmann <arnd@arndb.de>
Thu, 2 Nov 2017 11:13:36 +0000 (12:13 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Nov 2017 11:33:12 +0000 (20:33 +0900)
One of the timer conversion patches evidently escaped build testing
until I ran into in on ARM randconfig builds:

drivers/net/ethernet/seeq/ether3.c: In function 'ether3_ledoff':
drivers/net/ethernet/seeq/ether3.c:175:40: error: 'priv' undeclared (first use in this function); did you mean 'pid'?
drivers/net/ethernet/seeq/ether3.c:176:27: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]

This fixes the two small typos that caused the problems.

Fixes: 6fd9c53f7186 ("net: seeq: Convert timers to use timer_setup()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/seeq/ether3.c
drivers/net/ethernet/seeq/ether3.h

index da4807723a067c865cf61631f4a64397197d0c72..c5bc124b41a93a69cffccd7ca44602292309686c 100644 (file)
@@ -172,7 +172,7 @@ ether3_setbuffer(struct net_device *dev, buffer_rw_t read, int start)
  */
 static void ether3_ledoff(struct timer_list *t)
 {
-       struct dev_priv *private = from_timer(priv, t, timer);
+       struct dev_priv *private = from_timer(private, t, timer);
        struct net_device *dev = private->dev;
 
        ether3_outw(priv(dev)->regs.config2 |= CFG2_CTRLO, REG_CONFIG2);
index ea2ba286e6655c8cf7c664550930d5607b9219a7..be19e5fa5cf24aea4607208a8e39fa72b74c674d 100644 (file)
@@ -165,7 +165,7 @@ struct dev_priv {
     unsigned char tx_tail;             /* buffer nr of transmitting packet      */
     unsigned int rx_head;              /* address to fetch next packet from     */
     struct timer_list timer;
-    net_device *dev;
+    struct net_device *dev;
     int broken;                                /* 0 = ok, 1 = something went wrong      */
 };