Skip to content

Commit

Permalink
[PATCH] irda: donauboe fixes, cleanups
Browse files Browse the repository at this point in the history
- fix: toshoboe_invalid_dev() was recently removed, but not all callers
  were updated, causing the obvious linker error.  Remove caller,
  because the check (like the one removed) isn't used.

- fix: propagate request_irq() return value

- cleanup: remove void* casts

- cleanup: remove impossible ASSERTs

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jeff Garzik authored and Linus Torvalds committed Oct 10, 2006
1 parent 3c69302 commit 15e541f
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions drivers/net/irda/donauboe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -1348,25 +1345,22 @@ 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;

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);
Expand Down

0 comments on commit 15e541f

Please sign in to comment.