diff options
Diffstat (limited to 'drivers/net/hamradio')
-rw-r--r-- | drivers/net/hamradio/baycom_epp.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/baycom_par.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/baycom_ser_fdx.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/baycom_ser_hdx.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/dmascc.c | 4 | ||||
-rw-r--r-- | drivers/net/hamradio/scc.c | 4 | ||||
-rw-r--r-- | drivers/net/hamradio/yam.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 9220de9f4fe7..1ed9cccd3c11 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c | |||
@@ -323,7 +323,7 @@ static int eppconfig(struct baycom_state *bc) | |||
323 | 323 | ||
324 | /* ---------------------------------------------------------------------- */ | 324 | /* ---------------------------------------------------------------------- */ |
325 | 325 | ||
326 | static void epp_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 326 | static void epp_interrupt(int irq, void *dev_id) |
327 | { | 327 | { |
328 | } | 328 | } |
329 | 329 | ||
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c index 77411a00d1ee..5930aeb35015 100644 --- a/drivers/net/hamradio/baycom_par.c +++ b/drivers/net/hamradio/baycom_par.c | |||
@@ -270,7 +270,7 @@ static __inline__ void par96_rx(struct net_device *dev, struct baycom_state *bc) | |||
270 | 270 | ||
271 | /* --------------------------------------------------------------------- */ | 271 | /* --------------------------------------------------------------------- */ |
272 | 272 | ||
273 | static void par96_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 273 | static void par96_interrupt(int irq, void *dev_id) |
274 | { | 274 | { |
275 | struct net_device *dev = (struct net_device *)dev_id; | 275 | struct net_device *dev = (struct net_device *)dev_id; |
276 | struct baycom_state *bc = netdev_priv(dev); | 276 | struct baycom_state *bc = netdev_priv(dev); |
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c index 55906c7b4bb1..59214e74b9cf 100644 --- a/drivers/net/hamradio/baycom_ser_fdx.c +++ b/drivers/net/hamradio/baycom_ser_fdx.c | |||
@@ -279,7 +279,7 @@ static __inline__ void ser12_rx(struct net_device *dev, struct baycom_state *bc, | |||
279 | 279 | ||
280 | /* --------------------------------------------------------------------- */ | 280 | /* --------------------------------------------------------------------- */ |
281 | 281 | ||
282 | static irqreturn_t ser12_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 282 | static irqreturn_t ser12_interrupt(int irq, void *dev_id) |
283 | { | 283 | { |
284 | struct net_device *dev = (struct net_device *)dev_id; | 284 | struct net_device *dev = (struct net_device *)dev_id; |
285 | struct baycom_state *bc = netdev_priv(dev); | 285 | struct baycom_state *bc = netdev_priv(dev); |
diff --git a/drivers/net/hamradio/baycom_ser_hdx.c b/drivers/net/hamradio/baycom_ser_hdx.c index de95de8983da..3bcc57acbe6d 100644 --- a/drivers/net/hamradio/baycom_ser_hdx.c +++ b/drivers/net/hamradio/baycom_ser_hdx.c | |||
@@ -373,7 +373,7 @@ static inline void ser12_rx(struct net_device *dev, struct baycom_state *bc) | |||
373 | 373 | ||
374 | /* --------------------------------------------------------------------- */ | 374 | /* --------------------------------------------------------------------- */ |
375 | 375 | ||
376 | static irqreturn_t ser12_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 376 | static irqreturn_t ser12_interrupt(int irq, void *dev_id) |
377 | { | 377 | { |
378 | struct net_device *dev = (struct net_device *)dev_id; | 378 | struct net_device *dev = (struct net_device *)dev_id; |
379 | struct baycom_state *bc = netdev_priv(dev); | 379 | struct baycom_state *bc = netdev_priv(dev); |
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c index c9a46b89942a..0f8b9afd55b4 100644 --- a/drivers/net/hamradio/dmascc.c +++ b/drivers/net/hamradio/dmascc.c | |||
@@ -249,7 +249,7 @@ static void start_timer(struct scc_priv *priv, int t, int r15); | |||
249 | static inline unsigned char random(void); | 249 | static inline unsigned char random(void); |
250 | 250 | ||
251 | static inline void z8530_isr(struct scc_info *info); | 251 | static inline void z8530_isr(struct scc_info *info); |
252 | static irqreturn_t scc_isr(int irq, void *dev_id, struct pt_regs *regs); | 252 | static irqreturn_t scc_isr(int irq, void *dev_id); |
253 | static void rx_isr(struct scc_priv *priv); | 253 | static void rx_isr(struct scc_priv *priv); |
254 | static void special_condition(struct scc_priv *priv, int rc); | 254 | static void special_condition(struct scc_priv *priv, int rc); |
255 | static void rx_bh(void *arg); | 255 | static void rx_bh(void *arg); |
@@ -1142,7 +1142,7 @@ static inline void z8530_isr(struct scc_info *info) | |||
1142 | } | 1142 | } |
1143 | 1143 | ||
1144 | 1144 | ||
1145 | static irqreturn_t scc_isr(int irq, void *dev_id, struct pt_regs *regs) | 1145 | static irqreturn_t scc_isr(int irq, void *dev_id) |
1146 | { | 1146 | { |
1147 | struct scc_info *info = dev_id; | 1147 | struct scc_info *info = dev_id; |
1148 | 1148 | ||
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index df4b68142ac7..ec9b6d9b6f05 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c | |||
@@ -200,7 +200,7 @@ static void z8530_init(void); | |||
200 | 200 | ||
201 | static void init_channel(struct scc_channel *scc); | 201 | static void init_channel(struct scc_channel *scc); |
202 | static void scc_key_trx (struct scc_channel *scc, char tx); | 202 | static void scc_key_trx (struct scc_channel *scc, char tx); |
203 | static irqreturn_t scc_isr(int irq, void *dev_id, struct pt_regs *regs); | 203 | static irqreturn_t scc_isr(int irq, void *dev_id); |
204 | static void scc_init_timer(struct scc_channel *scc); | 204 | static void scc_init_timer(struct scc_channel *scc); |
205 | 205 | ||
206 | static int scc_net_alloc(const char *name, struct scc_channel *scc); | 206 | static int scc_net_alloc(const char *name, struct scc_channel *scc); |
@@ -626,7 +626,7 @@ static void scc_isr_dispatch(struct scc_channel *scc, int vector) | |||
626 | 626 | ||
627 | #define SCC_IRQTIMEOUT 30000 | 627 | #define SCC_IRQTIMEOUT 30000 |
628 | 628 | ||
629 | static irqreturn_t scc_isr(int irq, void *dev_id, struct pt_regs *regs) | 629 | static irqreturn_t scc_isr(int irq, void *dev_id) |
630 | { | 630 | { |
631 | unsigned char vector; | 631 | unsigned char vector; |
632 | struct scc_channel *scc; | 632 | struct scc_channel *scc; |
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index f98f5777dfbb..3c4455bd466d 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
@@ -702,7 +702,7 @@ static void yam_tx_byte(struct net_device *dev, struct yam_port *yp) | |||
702 | * ISR routine | 702 | * ISR routine |
703 | ************************************************************************************/ | 703 | ************************************************************************************/ |
704 | 704 | ||
705 | static irqreturn_t yam_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 705 | static irqreturn_t yam_interrupt(int irq, void *dev_id) |
706 | { | 706 | { |
707 | struct net_device *dev; | 707 | struct net_device *dev; |
708 | struct yam_port *yp; | 708 | struct yam_port *yp; |