projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
drivers
/
net
/
irda
/
donauboe.c
diff --git
a/drivers/net/irda/donauboe.c
b/drivers/net/irda/donauboe.c
index
a87a82c
..
b337e6d
100644
(file)
--- a/
drivers/net/irda/donauboe.c
+++ b/
drivers/net/irda/donauboe.c
@@
-232,7
+232,7
@@
char head=tete;
for (i=0;i<len;i+=16) {
for (j=0;j<16 && i+j<len;j++) { sprintf(&dump[3*j],"%02x.",data[i+j]); }
dump [3*j]=0;
for (i=0;i<len;i+=16) {
for (j=0;j<16 && i+j<len;j++) { sprintf(&dump[3*j],"%02x.",data[i+j]); }
dump [3*j]=0;
-
IRDA_DEBUG (2, "%c%s\n",head
, dump);
+
pr_debug("%c%s\n", head
, dump);
head='+';
}
}
head='+';
}
}
@@
-245,8
+245,6
@@
toshoboe_dumpregs (struct toshoboe_cb *self)
{
__u32 ringbase;
{
__u32 ringbase;
- IRDA_DEBUG (4, "%s()\n", __func__);
-
ringbase = INB (OBOE_RING_BASE0) << 10;
ringbase |= INB (OBOE_RING_BASE1) << 18;
ringbase |= INB (OBOE_RING_BASE2) << 26;
ringbase = INB (OBOE_RING_BASE0) << 10;
ringbase |= INB (OBOE_RING_BASE1) << 18;
ringbase |= INB (OBOE_RING_BASE2) << 26;
@@
-293,8
+291,6
@@
static void
toshoboe_disablebm (struct toshoboe_cb *self)
{
__u8 command;
toshoboe_disablebm (struct toshoboe_cb *self)
{
__u8 command;
- IRDA_DEBUG (4, "%s()\n", __func__);
-
pci_read_config_byte (self->pdev, PCI_COMMAND, &command);
command &= ~PCI_COMMAND_MASTER;
pci_write_config_byte (self->pdev, PCI_COMMAND, command);
pci_read_config_byte (self->pdev, PCI_COMMAND, &command);
command &= ~PCI_COMMAND_MASTER;
pci_write_config_byte (self->pdev, PCI_COMMAND, command);
@@
-305,8
+301,6
@@
toshoboe_disablebm (struct toshoboe_cb *self)
static void
toshoboe_stopchip (struct toshoboe_cb *self)
{
static void
toshoboe_stopchip (struct toshoboe_cb *self)
{
- IRDA_DEBUG (4, "%s()\n", __func__);
-
/*Disable interrupts */
OUTB (0x0, OBOE_IER);
/*Disable DMA, Disable Rx, Disable Tx */
/*Disable interrupts */
OUTB (0x0, OBOE_IER);
/*Disable DMA, Disable Rx, Disable Tx */
@@
-350,7
+344,7
@@
toshoboe_setbaud (struct toshoboe_cb *self)
__u16 pconfig = 0;
__u8 config0l = 0;
__u16 pconfig = 0;
__u8 config0l = 0;
-
IRDA_DEBUG (2,
"%s(%d/%d)\n", __func__, self->speed, self->io.speed);
+
pr_debug(
"%s(%d/%d)\n", __func__, self->speed, self->io.speed);
switch (self->speed)
{
switch (self->speed)
{
@@
-482,7
+476,6
@@
toshoboe_setbaud (struct toshoboe_cb *self)
static void
toshoboe_enablebm (struct toshoboe_cb *self)
{
static void
toshoboe_enablebm (struct toshoboe_cb *self)
{
- IRDA_DEBUG (4, "%s()\n", __func__);
pci_set_master (self->pdev);
}
pci_set_master (self->pdev);
}
@@
-492,8
+485,6
@@
toshoboe_initring (struct toshoboe_cb *self)
{
int i;
{
int i;
- IRDA_DEBUG (4, "%s()\n", __func__);
-
for (i = 0; i < TX_SLOTS; ++i)
{
self->ring->tx[i].len = 0;
for (i = 0; i < TX_SLOTS; ++i)
{
self->ring->tx[i].len = 0;
@@
-550,8
+541,6
@@
toshoboe_startchip (struct toshoboe_cb *self)
{
__u32 physaddr;
{
__u32 physaddr;
- IRDA_DEBUG (4, "%s()\n", __func__);
-
toshoboe_initring (self);
toshoboe_enablebm (self);
OUTBP (OBOE_CONFIG1_RESET, OBOE_CONFIG1);
toshoboe_initring (self);
toshoboe_enablebm (self);
OUTBP (OBOE_CONFIG1_RESET, OBOE_CONFIG1);
@@
-636,9
+625,8
@@
toshoboe_makemttpacket (struct toshoboe_cb *self, void *buf, int mtt)
xbofs=xbofs/80000; /*Eight bits per byte, and mtt is in us*/
xbofs++;
xbofs=xbofs/80000; /*Eight bits per byte, and mtt is in us*/
xbofs++;
- IRDA_DEBUG (2, DRIVER_NAME
- ": generated mtt of %d bytes for %d us at %d baud\n"
- , xbofs,mtt,self->speed);
+ pr_debug(DRIVER_NAME ": generated mtt of %d bytes for %d us at %d baud\n",
+ xbofs, mtt, self->speed);
if (xbofs > TX_LEN)
{
if (xbofs > TX_LEN)
{
@@
-824,8
+812,6
@@
toshoboe_probe (struct toshoboe_cb *self)
#endif
unsigned long flags;
#endif
unsigned long flags;
- IRDA_DEBUG (4, "%s()\n", __func__);
-
if (request_irq (self->io.irq, toshoboe_probeinterrupt,
self->io.irqflags, "toshoboe", (void *) self))
{
if (request_irq (self->io.irq, toshoboe_probeinterrupt,
self->io.irqflags, "toshoboe", (void *) self))
{
@@
-983,10
+969,10
@@
toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)
IRDA_ASSERT (self != NULL, return NETDEV_TX_OK; );
IRDA_ASSERT (self != NULL, return NETDEV_TX_OK; );
- IRDA_DEBUG (1, "%s.tx:%x(%x)%x\n", __func__
-
,skb->len,self->txpending,INB
(OBOE_ENABLEH));
+ pr_debug("%s.tx:%x(%x)%x\n",
+
__func__, skb->len, self->txpending, INB
(OBOE_ENABLEH));
if (!cb->magic) {
if (!cb->magic) {
-
IRDA_DEBUG (2,
"%s.Not IrLAP:%x\n", __func__, cb->magic);
+
pr_debug(
"%s.Not IrLAP:%x\n", __func__, cb->magic);
#ifdef DUMP_PACKETS
_dumpbufs(skb->data,skb->len,'>');
#endif
#ifdef DUMP_PACKETS
_dumpbufs(skb->data,skb->len,'>');
#endif
@@
-1012,8
+998,8
@@
toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)
if (self->txpending || skb->len)
{
self->new_speed = speed;
if (self->txpending || skb->len)
{
self->new_speed = speed;
-
IRDA_DEBUG (1,
"%s: Queued TxDone scheduled speed change %d\n" ,
-
__func__, speed);
+
pr_debug(
"%s: Queued TxDone scheduled speed change %d\n" ,
+ __func__, speed);
/* if no data, that's all! */
if (!skb->len)
{
/* if no data, that's all! */
if (!skb->len)
{
@@
-1055,8
+1041,7
@@
toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)
/* which we will add a wrong checksum to */
mtt = toshoboe_makemttpacket (self, self->tx_bufs[self->txs], mtt);
/* which we will add a wrong checksum to */
mtt = toshoboe_makemttpacket (self, self->tx_bufs[self->txs], mtt);
- IRDA_DEBUG (1, "%s.mtt:%x(%x)%d\n", __func__
- ,skb->len,mtt,self->txpending);
+ pr_debug("%s.mtt:%x(%x)%d\n", __func__, skb->len, mtt, self->txpending);
if (mtt)
{
self->ring->tx[self->txs].len = mtt & 0xfff;
if (mtt)
{
self->ring->tx[self->txs].len = mtt & 0xfff;
@@
-1099,8
+1084,9
@@
dumpbufs(skb->data,skb->len,'>');
if (self->ring->tx[self->txs].control & OBOE_CTL_TX_HW_OWNS)
{
if (self->ring->tx[self->txs].control & OBOE_CTL_TX_HW_OWNS)
{
- IRDA_DEBUG (0, "%s.ful:%x(%x)%x\n", __func__
- ,skb->len, self->ring->tx[self->txs].control, self->txpending);
+ pr_debug("%s.ful:%x(%x)%x\n",
+ __func__, skb->len, self->ring->tx[self->txs].control,
+ self->txpending);
toshoboe_start_DMA(self, OBOE_CONFIG0H_ENTX);
spin_unlock_irqrestore(&self->spinlock, flags);
return NETDEV_TX_BUSY;
toshoboe_start_DMA(self, OBOE_CONFIG0H_ENTX);
spin_unlock_irqrestore(&self->spinlock, flags);
return NETDEV_TX_BUSY;
@@
-1177,8
+1163,7
@@
toshoboe_interrupt (int irq, void *dev_id)
if (self->ring->tx[i].control & OBOE_CTL_TX_HW_OWNS)
self->txpending++;
}
if (self->ring->tx[i].control & OBOE_CTL_TX_HW_OWNS)
self->txpending++;
}
- IRDA_DEBUG (1, "%s.txd(%x)%x/%x\n", __func__
- ,irqstat,txp,self->txpending);
+ pr_debug("%s.txd(%x)%x/%x\n", __func__, irqstat, txp, self->txpending);
txp = INB (OBOE_TXSLOT) & OBOE_SLOT_MASK;
txp = INB (OBOE_TXSLOT) & OBOE_SLOT_MASK;
@@
-1206,8
+1191,8
@@
toshoboe_interrupt (int irq, void *dev_id)
if ((!self->txpending) && (self->new_speed))
{
self->speed = self->new_speed;
if ((!self->txpending) && (self->new_speed))
{
self->speed = self->new_speed;
-
IRDA_DEBUG (1,
"%s: Executed TxDone scheduled speed change %d\n",
-
__func__, self->speed);
+
pr_debug(
"%s: Executed TxDone scheduled speed change %d\n",
+ __func__, self->speed);
toshoboe_setbaud (self);
}
toshoboe_setbaud (self);
}
@@
-1222,8
+1207,8
@@
toshoboe_interrupt (int irq, void *dev_id)
{
int len = self->ring->rx[self->rxs].len;
skb = NULL;
{
int len = self->ring->rx[self->rxs].len;
skb = NULL;
-
IRDA_DEBUG (3,
"%s.rcv:%x(%x)\n", __func__
-
,len,
self->ring->rx[self->rxs].control);
+
pr_debug(
"%s.rcv:%x(%x)\n", __func__
+
, len,
self->ring->rx[self->rxs].control);
#ifdef DUMP_PACKETS
dumpbufs(self->rx_bufs[self->rxs],len,'<');
#ifdef DUMP_PACKETS
dumpbufs(self->rx_bufs[self->rxs],len,'<');
@@
-1244,7
+1229,7
@@
dumpbufs(self->rx_bufs[self->rxs],len,'<');
len -= 2;
else
len = 0;
len -= 2;
else
len = 0;
-
IRDA_DEBUG (1, "%s.SIR:%x(%x)\n", __func__, len,
enable);
+
pr_debug("%s.SIR:%x(%x)\n", __func__, len,
enable);
}
#ifdef USE_MIR
}
#ifdef USE_MIR
@@
-1254,7
+1239,7
@@
dumpbufs(self->rx_bufs[self->rxs],len,'<');
len -= 2;
else
len = 0;
len -= 2;
else
len = 0;
-
IRDA_DEBUG (2, "%s.MIR:%x(%x)\n", __func__, len,
enable);
+
pr_debug("%s.MIR:%x(%x)\n", __func__, len,
enable);
}
#endif
else if (enable & OBOE_ENABLEH_FIRON)
}
#endif
else if (enable & OBOE_ENABLEH_FIRON)
@@
-1263,10
+1248,10
@@
dumpbufs(self->rx_bufs[self->rxs],len,'<');
len -= 4; /*FIXME: check this */
else
len = 0;
len -= 4; /*FIXME: check this */
else
len = 0;
-
IRDA_DEBUG (1, "%s.FIR:%x(%x)\n", __func__, len,
enable);
+
pr_debug("%s.FIR:%x(%x)\n", __func__, len,
enable);
}
else
}
else
-
IRDA_DEBUG (0, "%s.?IR:%x(%x)\n", __func__, len,
enable);
+
pr_debug("%s.?IR:%x(%x)\n", __func__, len,
enable);
if (len)
{
if (len)
{
@@
-1299,8
+1284,8
@@
dumpbufs(self->rx_bufs[self->rxs],len,'<');
/* (SIR) data is splitted in several slots. */
/* we have to join all the received buffers received */
/*in a large buffer before checking CRC. */
/* (SIR) data is splitted in several slots. */
/* we have to join all the received buffers received */
/*in a large buffer before checking CRC. */
-
IRDA_DEBUG (0,
"%s.err:%x(%x)\n", __func__
-
,len,
self->ring->rx[self->rxs].control);
+
pr_debug(
"%s.err:%x(%x)\n", __func__
+
, len,
self->ring->rx[self->rxs].control);
}
self->ring->rx[self->rxs].len = 0x0;
}
self->ring->rx[self->rxs].len = 0x0;
@@
-1327,8
+1312,8
@@
dumpbufs(self->rx_bufs[self->rxs],len,'<');
if (irqstat & OBOE_INT_SIP)
{
self->int_sip++;
if (irqstat & OBOE_INT_SIP)
{
self->int_sip++;
- IRDA_DEBUG (1, "%s.sip:%x(%x)%x\n", __func__
-
,self->int_sip,irqstat,
self->txpending);
+ pr_debug("%s.sip:%x(%x)%x\n",
+
__func__, self->int_sip, irqstat,
self->txpending);
}
return IRQ_HANDLED;
}
}
return IRQ_HANDLED;
}
@@
-1341,8
+1326,6
@@
toshoboe_net_open (struct net_device *dev)
unsigned long flags;
int rc;
unsigned long flags;
int rc;
- IRDA_DEBUG (4, "%s()\n", __func__);
-
self = netdev_priv(dev);
if (self->async)
self = netdev_priv(dev);
if (self->async)
@@
-1379,8
+1362,6
@@
toshoboe_net_close (struct net_device *dev)
{
struct toshoboe_cb *self;
{
struct toshoboe_cb *self;
- IRDA_DEBUG (4, "%s()\n", __func__);
-
IRDA_ASSERT (dev != NULL, return -1; );
self = netdev_priv(dev);
IRDA_ASSERT (dev != NULL, return -1; );
self = netdev_priv(dev);
@@
-1424,7
+1405,7
@@
toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
IRDA_ASSERT (self != NULL, return -1; );
IRDA_ASSERT (self != NULL, return -1; );
-
IRDA_DEBUG (5,
"%s(), %s, (cmd=0x%X)\n", __func__, dev->name, cmd);
+
pr_debug(
"%s(), %s, (cmd=0x%X)\n", __func__, dev->name, cmd);
/* Disable interrupts & save flags */
spin_lock_irqsave(&self->spinlock, flags);
/* Disable interrupts & save flags */
spin_lock_irqsave(&self->spinlock, flags);
@@
-1436,8
+1417,8
@@
toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
* speed, so we still must allow for speed change within
* interrupt context.
*/
* speed, so we still must allow for speed change within
* interrupt context.
*/
- IRDA_DEBUG (1, "%s(BANDWIDTH), %s, (%X/%ld\n", __func__
-
,dev->name, INB (OBOE_STATUS), irq->ifr_baudrate
);
+ pr_debug("%s(BANDWIDTH), %s, (%X/%ld\n",
+
__func__, dev->name, INB(OBOE_STATUS), irq->ifr_baudrate
);
if (!in_interrupt () && !capable (CAP_NET_ADMIN)) {
ret = -EPERM;
goto out;
if (!in_interrupt () && !capable (CAP_NET_ADMIN)) {
ret = -EPERM;
goto out;
@@
-1449,8
+1430,9
@@
toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
self->new_speed = irq->ifr_baudrate;
break;
case SIOCSMEDIABUSY: /* Set media busy */
self->new_speed = irq->ifr_baudrate;
break;
case SIOCSMEDIABUSY: /* Set media busy */
- IRDA_DEBUG (1, "%s(MEDIABUSY), %s, (%X/%x)\n", __func__
- ,dev->name, INB (OBOE_STATUS), capable (CAP_NET_ADMIN) );
+ pr_debug("%s(MEDIABUSY), %s, (%X/%x)\n",
+ __func__, dev->name,
+ INB(OBOE_STATUS), capable(CAP_NET_ADMIN));
if (!capable (CAP_NET_ADMIN)) {
ret = -EPERM;
goto out;
if (!capable (CAP_NET_ADMIN)) {
ret = -EPERM;
goto out;
@@
-1459,11
+1441,11
@@
toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
break;
case SIOCGRECEIVING: /* Check if we are receiving right now */
irq->ifr_receiving = (INB (OBOE_STATUS) & OBOE_STATUS_RXBUSY) ? 1 : 0;
break;
case SIOCGRECEIVING: /* Check if we are receiving right now */
irq->ifr_receiving = (INB (OBOE_STATUS) & OBOE_STATUS_RXBUSY) ? 1 : 0;
- IRDA_DEBUG (3, "%s(RECEIVING), %s, (%X/%x)\n", __func__
-
,dev->name, INB (OBOE_STATUS), irq->ifr_receiving
);
+ pr_debug("%s(RECEIVING), %s, (%X/%x)\n",
+
__func__, dev->name, INB(OBOE_STATUS), irq->ifr_receiving
);
break;
default:
break;
default:
-
IRDA_DEBUG (1,
"%s(?), %s, (cmd=0x%X)\n", __func__, dev->name, cmd);
+
pr_debug(
"%s(?), %s, (cmd=0x%X)\n", __func__, dev->name, cmd);
ret = -EOPNOTSUPP;
}
out:
ret = -EOPNOTSUPP;
}
out:
@@
-1490,8
+1472,6
@@
toshoboe_close (struct pci_dev *pci_dev)
int i;
struct toshoboe_cb *self = pci_get_drvdata(pci_dev);
int i;
struct toshoboe_cb *self = pci_get_drvdata(pci_dev);
- IRDA_DEBUG (4, "%s()\n", __func__);
-
IRDA_ASSERT (self != NULL, return; );
if (!self->stopped)
IRDA_ASSERT (self != NULL, return; );
if (!self->stopped)
@@
-1538,8
+1518,6
@@
toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
int ok = 0;
int err;
int ok = 0;
int err;
- IRDA_DEBUG (4, "%s()\n", __func__);
-
if ((err=pci_enable_device(pci_dev)))
return err;
if ((err=pci_enable_device(pci_dev)))
return err;
@@
-1700,8
+1678,6
@@
toshoboe_gotosleep (struct pci_dev *pci_dev, pm_message_t crap)
unsigned long flags;
int i = 10;
unsigned long flags;
int i = 10;
- IRDA_DEBUG (4, "%s()\n", __func__);
-
if (!self || self->stopped)
return 0;
if (!self || self->stopped)
return 0;
@@
-1728,8
+1704,6
@@
toshoboe_wakeup (struct pci_dev *pci_dev)
struct toshoboe_cb *self = pci_get_drvdata(pci_dev);
unsigned long flags;
struct toshoboe_cb *self = pci_get_drvdata(pci_dev);
unsigned long flags;
- IRDA_DEBUG (4, "%s()\n", __func__);
-
if (!self || !self->stopped)
return 0;
if (!self || !self->stopped)
return 0;