git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
irda
/
w83977af_ir.c
diff --git
a/drivers/net/irda/w83977af_ir.c
b/drivers/net/irda/w83977af_ir.c
index
0ea65c4
..
4212657
100644
(file)
--- a/
drivers/net/irda/w83977af_ir.c
+++ b/
drivers/net/irda/w83977af_ir.c
@@
-40,7
+40,6
@@
********************************************************************/
#include <linux/module.h>
********************************************************************/
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/skbuff.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/skbuff.h>
@@
-117,7
+116,7
@@
static int __init w83977af_init(void)
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
- for (i=0; (io[i] < 2000) && (i <
4); i++) {
+ for (i=0; (io[i] < 2000) && (i <
ARRAY_SIZE(dev_self)); i++) {
if (w83977af_open(i, io[i], irq[i], dma[i]) == 0)
return 0;
}
if (w83977af_open(i, io[i], irq[i], dma[i]) == 0)
return 0;
}
@@
-136,7
+135,7
@@
static void __exit w83977af_cleanup(void)
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
- for (i=0; i <
4
; i++) {
+ for (i=0; i <
ARRAY_SIZE(dev_self)
; i++) {
if (dev_self[i])
w83977af_close(dev_self[i]);
}
if (dev_self[i])
w83977af_close(dev_self[i]);
}
@@
-1112,20
+1111,14
@@
static __u8 w83977af_fir_interrupt(struct w83977af_ir *self, int isr)
* An interrupt from the chip has arrived. Time to do some work
*
*/
* An interrupt from the chip has arrived. Time to do some work
*
*/
-static irqreturn_t w83977af_interrupt(int irq, void *dev_id,
- struct pt_regs *regs)
+static irqreturn_t w83977af_interrupt(int irq, void *dev_id)
{
{
- struct net_device *dev =
(struct net_device *)
dev_id;
+ struct net_device *dev = dev_id;
struct w83977af_ir *self;
__u8 set, icr, isr;
int iobase;
struct w83977af_ir *self;
__u8 set, icr, isr;
int iobase;
- if (!dev) {
- printk(KERN_WARNING "%s: irq %d for unknown device.\n",
- driver_name, irq);
- return IRQ_NONE;
- }
- self = (struct w83977af_ir *) dev->priv;
+ self = dev->priv;
iobase = self->io.fir_base;
iobase = self->io.fir_base;