diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/irda/smsc-ircc2.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index 236501f0c5a6..2c9d3309314c 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c | |||
@@ -172,8 +172,8 @@ static int smsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev) | |||
172 | static int smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev); | 172 | static int smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev); |
173 | static void smsc_ircc_dma_xmit(struct smsc_ircc_cb *self, int bofs); | 173 | static void smsc_ircc_dma_xmit(struct smsc_ircc_cb *self, int bofs); |
174 | static void smsc_ircc_dma_xmit_complete(struct smsc_ircc_cb *self); | 174 | static void smsc_ircc_dma_xmit_complete(struct smsc_ircc_cb *self); |
175 | static void smsc_ircc_change_speed(void *priv, u32 speed); | 175 | static void smsc_ircc_change_speed(struct smsc_ircc_cb *self, u32 speed); |
176 | static void smsc_ircc_set_sir_speed(void *priv, u32 speed); | 176 | static void smsc_ircc_set_sir_speed(struct smsc_ircc_cb *self, u32 speed); |
177 | static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 177 | static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *regs); |
178 | static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev); | 178 | static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev); |
179 | static void smsc_ircc_sir_start(struct smsc_ircc_cb *self); | 179 | static void smsc_ircc_sir_start(struct smsc_ircc_cb *self); |
@@ -964,9 +964,8 @@ static void smsc_ircc_fir_stop(struct smsc_ircc_cb *self) | |||
964 | * This function *must* be called with spinlock held, because it may | 964 | * This function *must* be called with spinlock held, because it may |
965 | * be called from the irq handler. - Jean II | 965 | * be called from the irq handler. - Jean II |
966 | */ | 966 | */ |
967 | static void smsc_ircc_change_speed(void *priv, u32 speed) | 967 | static void smsc_ircc_change_speed(struct smsc_ircc_cb *self, u32 speed) |
968 | { | 968 | { |
969 | struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) priv; | ||
970 | struct net_device *dev; | 969 | struct net_device *dev; |
971 | int last_speed_was_sir; | 970 | int last_speed_was_sir; |
972 | 971 | ||
@@ -1031,9 +1030,8 @@ static void smsc_ircc_change_speed(void *priv, u32 speed) | |||
1031 | * Set speed of IrDA port to specified baudrate | 1030 | * Set speed of IrDA port to specified baudrate |
1032 | * | 1031 | * |
1033 | */ | 1032 | */ |
1034 | void smsc_ircc_set_sir_speed(void *priv, __u32 speed) | 1033 | void smsc_ircc_set_sir_speed(struct smsc_ircc_cb *self, __u32 speed) |
1035 | { | 1034 | { |
1036 | struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) priv; | ||
1037 | int iobase; | 1035 | int iobase; |
1038 | int fcr; /* FIFO control reg */ | 1036 | int fcr; /* FIFO control reg */ |
1039 | int lcr; /* Line control reg */ | 1037 | int lcr; /* Line control reg */ |