git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'e1000-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[pandora-kernel.git]
/
drivers
/
net
/
irda
/
donauboe.c
diff --git
a/drivers/net/irda/donauboe.c
b/drivers/net/irda/donauboe.c
index
910c0ca
..
3ca47bf
100644
(file)
--- a/
drivers/net/irda/donauboe.c
+++ b/
drivers/net/irda/donauboe.c
@@
-657,12
+657,6
@@
toshoboe_makemttpacket (struct toshoboe_cb *self, void *buf, int mtt)
return xbofs;
}
return xbofs;
}
-static int toshoboe_invalid_dev(int irq)
-{
- printk (KERN_WARNING DRIVER_NAME ": irq %d for unknown device.\n", irq);
- return 1;
-}
-
#ifdef USE_PROBE
/***********************************************************************/
/* Probe code */
#ifdef USE_PROBE
/***********************************************************************/
/* Probe code */
@@
-709,14
+703,11
@@
stuff_byte (__u8 byte, __u8 * buf)
}
static irqreturn_t
}
static irqreturn_t
-toshoboe_probeinterrupt (int irq, void *dev_id
, struct pt_regs *regs
)
+toshoboe_probeinterrupt (int irq, void *dev_id)
{
{
- struct toshoboe_cb *self =
(struct toshoboe_cb *)
dev_id;
+ struct toshoboe_cb *self = dev_id;
__u8 irqstat;
__u8 irqstat;
- if (self == NULL && toshoboe_invalid_dev(irq))
- return IRQ_NONE;
-
irqstat = INB (OBOE_ISR);
/* was it us */
irqstat = INB (OBOE_ISR);
/* was it us */
@@
-1128,7
+1119,7
@@
dumpbufs(skb->data,skb->len,'>');
else
{
len = skb->len;
else
{
len = skb->len;
-
memcpy (self->tx_bufs[self->txs], skb->data
, len);
+
skb_copy_from_linear_data(skb, self->tx_bufs[self->txs]
, len);
}
self->ring->tx[self->txs].len = len & 0x0fff;
}
self->ring->tx[self->txs].len = len & 0x0fff;
@@
-1161,15
+1152,12
@@
dumpbufs(skb->data,skb->len,'>');
/*interrupt handler */
static irqreturn_t
/*interrupt handler */
static irqreturn_t
-toshoboe_interrupt (int irq, void *dev_id
, struct pt_regs *regs
)
+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;
__u8 irqstat;
struct sk_buff *skb = NULL;
- if (self == NULL && toshoboe_invalid_dev(irq))
- return IRQ_NONE;
-
irqstat = INB (OBOE_ISR);
/* was it us */
irqstat = INB (OBOE_ISR);
/* was it us */
@@
-1294,11
+1282,11
@@
dumpbufs(self->rx_bufs[self->rxs],len,'<');
skb_reserve (skb, 1);
skb_put (skb, len);
skb_reserve (skb, 1);
skb_put (skb, len);
- memcpy (skb->data, self->rx_bufs[self->rxs], len);
-
+ skb_copy_to_linear_data(skb, self->rx_bufs[self->rxs],
+ len);
self->stats.rx_packets++;
skb->dev = self->netdev;
self->stats.rx_packets++;
skb->dev = self->netdev;
- skb
->mac.raw = skb->data
;
+ skb
_reset_mac_header(skb)
;
skb->protocol = htons (ETH_P_IRDA);
}
else
skb->protocol = htons (ETH_P_IRDA);
}
else
@@
-1357,13
+1345,11
@@
toshoboe_net_open (struct net_device *dev)
{
struct toshoboe_cb *self;
unsigned long flags;
{
struct toshoboe_cb *self;
unsigned long flags;
+ int rc;
IRDA_DEBUG (4, "%s()\n", __FUNCTION__);
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->async)
return -EBUSY;
@@
-1371,11
+1357,10
@@
toshoboe_net_open (struct net_device *dev)
if (self->stopped)
return 0;
if (self->stopped)
return 0;
- if (request_irq (self->io.irq, toshoboe_interrupt,
- SA_SHIRQ | SA_INTERRUPT, 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);
spin_lock_irqsave(&self->spinlock, flags);
toshoboe_startchip (self);
@@
-1573,7
+1558,7
@@
toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
self->io.fir_base = self->base;
self->io.fir_ext = OBOE_IO_EXTENT;
self->io.irq = pci_dev->irq;
self->io.fir_base = self->base;
self->io.fir_ext = OBOE_IO_EXTENT;
self->io.irq = pci_dev->irq;
- self->io.irqflags =
SA_SHIRQ | SA_INTERRUPT
;
+ self->io.irqflags =
IRQF_SHARED | IRQF_DISABLED
;
self->speed = self->io.speed = 9600;
self->async = 0;
self->speed = self->io.speed = 9600;
self->async = 0;
@@
-1618,7
+1603,7
@@
toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
irda_qos_bits_to_value (&self->qos);
/* Allocate twice the size to guarantee alignment */
irda_qos_bits_to_value (&self->qos);
/* Allocate twice the size to guarantee alignment */
- self->ringbuf =
(void *) kmalloc
(OBOE_RING_LEN << 1, GFP_KERNEL);
+ self->ringbuf =
kmalloc
(OBOE_RING_LEN << 1, GFP_KERNEL);
if (!self->ringbuf)
{
printk (KERN_ERR DRIVER_NAME ": can't allocate DMA buffers\n");
if (!self->ringbuf)
{
printk (KERN_ERR DRIVER_NAME ": can't allocate DMA buffers\n");