|
@@ -1154,13 +1154,10 @@ dumpbufs(skb->data,skb->len,'>');
|
|
|
static irqreturn_t
|
|
|
toshoboe_interrupt (int irq, void *dev_id)
|
|
|
{
|
|
|
- struct toshoboe_cb *self = (struct toshoboe_cb *) dev_id;
|
|
|
+ struct toshoboe_cb *self = dev_id;
|
|
|
__u8 irqstat;
|
|
|
struct sk_buff *skb = NULL;
|
|
|
|
|
|
- if (self == NULL && toshoboe_invalid_dev(irq))
|
|
|
- return IRQ_NONE;
|
|
|
-
|
|
|
irqstat = INB (OBOE_ISR);
|
|
|
|
|
|
/* was it us */
|
|
@@ -1348,13 +1345,11 @@ toshoboe_net_open (struct net_device *dev)
|
|
|
{
|
|
|
struct toshoboe_cb *self;
|
|
|
unsigned long flags;
|
|
|
+ int rc;
|
|
|
|
|
|
IRDA_DEBUG (4, "%s()\n", __FUNCTION__);
|
|
|
|
|
|
- IRDA_ASSERT (dev != NULL, return -1; );
|
|
|
- self = (struct toshoboe_cb *) dev->priv;
|
|
|
-
|
|
|
- IRDA_ASSERT (self != NULL, return 0; );
|
|
|
+ self = netdev_priv(dev);
|
|
|
|
|
|
if (self->async)
|
|
|
return -EBUSY;
|
|
@@ -1362,11 +1357,10 @@ toshoboe_net_open (struct net_device *dev)
|
|
|
if (self->stopped)
|
|
|
return 0;
|
|
|
|
|
|
- if (request_irq (self->io.irq, toshoboe_interrupt,
|
|
|
- IRQF_SHARED | IRQF_DISABLED, dev->name, (void *) self))
|
|
|
- {
|
|
|
- return -EAGAIN;
|
|
|
- }
|
|
|
+ rc = request_irq (self->io.irq, toshoboe_interrupt,
|
|
|
+ IRQF_SHARED | IRQF_DISABLED, dev->name, self);
|
|
|
+ if (rc)
|
|
|
+ return rc;
|
|
|
|
|
|
spin_lock_irqsave(&self->spinlock, flags);
|
|
|
toshoboe_startchip (self);
|