Commit 955a9d20 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

irda: Convert IRDA_DEBUG to pr_debug

Use the normal kernel debugging mechanism which also
enables dynamic_debug at the same time.

Other miscellanea:

o Remove sysctl for irda_debug
o Remove function tracing like uses (use ftrace instead)
o Coalesce formats
o Realign arguments
o Remove unnecessary OOM messages
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8d326d81
...@@ -107,8 +107,6 @@ static int act200l_open(struct sir_dev *dev) ...@@ -107,8 +107,6 @@ static int act200l_open(struct sir_dev *dev)
{ {
struct qos_info *qos = &dev->qos; struct qos_info *qos = &dev->qos;
IRDA_DEBUG(2, "%s()\n", __func__ );
/* Power on the dongle */ /* Power on the dongle */
sirdev_set_dtr_rts(dev, TRUE, TRUE); sirdev_set_dtr_rts(dev, TRUE, TRUE);
...@@ -124,8 +122,6 @@ static int act200l_open(struct sir_dev *dev) ...@@ -124,8 +122,6 @@ static int act200l_open(struct sir_dev *dev)
static int act200l_close(struct sir_dev *dev) static int act200l_close(struct sir_dev *dev)
{ {
IRDA_DEBUG(2, "%s()\n", __func__ );
/* Power off the dongle */ /* Power off the dongle */
sirdev_set_dtr_rts(dev, FALSE, FALSE); sirdev_set_dtr_rts(dev, FALSE, FALSE);
...@@ -143,8 +139,6 @@ static int act200l_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -143,8 +139,6 @@ static int act200l_change_speed(struct sir_dev *dev, unsigned speed)
u8 control[3]; u8 control[3];
int ret = 0; int ret = 0;
IRDA_DEBUG(2, "%s()\n", __func__ );
/* Clear DTR and set RTS to enter command mode */ /* Clear DTR and set RTS to enter command mode */
sirdev_set_dtr_rts(dev, FALSE, TRUE); sirdev_set_dtr_rts(dev, FALSE, TRUE);
...@@ -212,8 +206,6 @@ static int act200l_reset(struct sir_dev *dev) ...@@ -212,8 +206,6 @@ static int act200l_reset(struct sir_dev *dev)
}; };
int ret = 0; int ret = 0;
IRDA_DEBUG(2, "%s()\n", __func__ );
switch (state) { switch (state) {
case SIRDEV_STATE_DONGLE_RESET: case SIRDEV_STATE_DONGLE_RESET:
/* Reset the dongle : set RTS low for 25 ms */ /* Reset the dongle : set RTS low for 25 ms */
......
...@@ -165,8 +165,7 @@ static int actisys_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -165,8 +165,7 @@ static int actisys_change_speed(struct sir_dev *dev, unsigned speed)
int ret = 0; int ret = 0;
int i = 0; int i = 0;
IRDA_DEBUG(4, "%s(), speed=%d (was %d)\n", __func__, pr_debug("%s(), speed=%d (was %d)\n", __func__, speed, dev->speed);
speed, dev->speed);
/* dongle was already resetted from irda_request state machine, /* dongle was already resetted from irda_request state machine,
* we are in known state (dongle default) * we are in known state (dongle default)
......
This diff is collapsed.
This diff is collapsed.
...@@ -86,8 +86,6 @@ static int girbil_open(struct sir_dev *dev) ...@@ -86,8 +86,6 @@ static int girbil_open(struct sir_dev *dev)
{ {
struct qos_info *qos = &dev->qos; struct qos_info *qos = &dev->qos;
IRDA_DEBUG(2, "%s()\n", __func__);
/* Power on dongle */ /* Power on dongle */
sirdev_set_dtr_rts(dev, TRUE, TRUE); sirdev_set_dtr_rts(dev, TRUE, TRUE);
...@@ -102,8 +100,6 @@ static int girbil_open(struct sir_dev *dev) ...@@ -102,8 +100,6 @@ static int girbil_open(struct sir_dev *dev)
static int girbil_close(struct sir_dev *dev) static int girbil_close(struct sir_dev *dev)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
/* Power off dongle */ /* Power off dongle */
sirdev_set_dtr_rts(dev, FALSE, FALSE); sirdev_set_dtr_rts(dev, FALSE, FALSE);
...@@ -126,8 +122,6 @@ static int girbil_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -126,8 +122,6 @@ static int girbil_change_speed(struct sir_dev *dev, unsigned speed)
u8 control[2]; u8 control[2];
static int ret = 0; static int ret = 0;
IRDA_DEBUG(2, "%s()\n", __func__);
/* dongle alread reset - port and dongle at default speed */ /* dongle alread reset - port and dongle at default speed */
switch(state) { switch(state) {
...@@ -210,8 +204,6 @@ static int girbil_reset(struct sir_dev *dev) ...@@ -210,8 +204,6 @@ static int girbil_reset(struct sir_dev *dev)
u8 control = GIRBIL_TXEN | GIRBIL_RXEN; u8 control = GIRBIL_TXEN | GIRBIL_RXEN;
int ret = 0; int ret = 0;
IRDA_DEBUG(2, "%s()\n", __func__);
switch (state) { switch (state) {
case SIRDEV_STATE_DONGLE_RESET: case SIRDEV_STATE_DONGLE_RESET:
/* Reset dongle */ /* Reset dongle */
......
This diff is collapsed.
...@@ -240,7 +240,7 @@ static void irtty_receive_buf(struct tty_struct *tty, const unsigned char *cp, ...@@ -240,7 +240,7 @@ static void irtty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
* Characters received with a parity error, etc? * Characters received with a parity error, etc?
*/ */
if (fp && *fp++) { if (fp && *fp++) {
IRDA_DEBUG(0, "Framing or parity error!\n"); pr_debug("Framing or parity error!\n");
sirdev_receive(dev, NULL, 0); /* notify sir_dev (updating stats) */ sirdev_receive(dev, NULL, 0); /* notify sir_dev (updating stats) */
return; return;
} }
...@@ -387,7 +387,7 @@ static int irtty_ioctl(struct tty_struct *tty, struct file *file, unsigned int c ...@@ -387,7 +387,7 @@ static int irtty_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
IRDA_ASSERT(priv != NULL, return -ENODEV;); IRDA_ASSERT(priv != NULL, return -ENODEV;);
IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return -EBADR;); IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return -EBADR;);
IRDA_DEBUG(3, "%s(cmd=0x%X)\n", __func__, cmd); pr_debug("%s(cmd=0x%X)\n", __func__, cmd);
dev = priv->dev; dev = priv->dev;
IRDA_ASSERT(dev != NULL, return -1;); IRDA_ASSERT(dev != NULL, return -1;);
...@@ -477,7 +477,7 @@ static int irtty_open(struct tty_struct *tty) ...@@ -477,7 +477,7 @@ static int irtty_open(struct tty_struct *tty)
mutex_unlock(&irtty_mutex); mutex_unlock(&irtty_mutex);
IRDA_DEBUG(0, "%s - %s: irda line discipline opened\n", __func__, tty->name); pr_debug("%s - %s: irda line discipline opened\n", __func__, tty->name);
return 0; return 0;
...@@ -528,7 +528,7 @@ static void irtty_close(struct tty_struct *tty) ...@@ -528,7 +528,7 @@ static void irtty_close(struct tty_struct *tty)
kfree(priv); kfree(priv);
IRDA_DEBUG(0, "%s - %s: irda line discipline closed\n", __func__, tty->name); pr_debug("%s - %s: irda line discipline closed\n", __func__, tty->name);
} }
/* ------------------------------------------------------- */ /* ------------------------------------------------------- */
......
...@@ -76,8 +76,6 @@ static int litelink_open(struct sir_dev *dev) ...@@ -76,8 +76,6 @@ static int litelink_open(struct sir_dev *dev)
{ {
struct qos_info *qos = &dev->qos; struct qos_info *qos = &dev->qos;
IRDA_DEBUG(2, "%s()\n", __func__);
/* Power up dongle */ /* Power up dongle */
sirdev_set_dtr_rts(dev, TRUE, TRUE); sirdev_set_dtr_rts(dev, TRUE, TRUE);
...@@ -93,8 +91,6 @@ static int litelink_open(struct sir_dev *dev) ...@@ -93,8 +91,6 @@ static int litelink_open(struct sir_dev *dev)
static int litelink_close(struct sir_dev *dev) static int litelink_close(struct sir_dev *dev)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
/* Power off dongle */ /* Power off dongle */
sirdev_set_dtr_rts(dev, FALSE, FALSE); sirdev_set_dtr_rts(dev, FALSE, FALSE);
...@@ -111,8 +107,6 @@ static int litelink_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -111,8 +107,6 @@ static int litelink_change_speed(struct sir_dev *dev, unsigned speed)
{ {
int i; int i;
IRDA_DEBUG(2, "%s()\n", __func__);
/* dongle already reset by irda-thread - current speed (dongle and /* dongle already reset by irda-thread - current speed (dongle and
* port) is the default speed (115200 for litelink!) * port) is the default speed (115200 for litelink!)
*/ */
...@@ -154,8 +148,6 @@ static int litelink_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -154,8 +148,6 @@ static int litelink_change_speed(struct sir_dev *dev, unsigned speed)
*/ */
static int litelink_reset(struct sir_dev *dev) static int litelink_reset(struct sir_dev *dev)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
/* probably the power-up can be dropped here, but with only /* probably the power-up can be dropped here, but with only
* 15 usec delay it's not worth the risk unless somebody with * 15 usec delay it's not worth the risk unless somebody with
* the hardware confirms it doesn't break anything... * the hardware confirms it doesn't break anything...
......
...@@ -65,13 +65,11 @@ static struct dongle_driver ma600 = { ...@@ -65,13 +65,11 @@ static struct dongle_driver ma600 = {
static int __init ma600_sir_init(void) static int __init ma600_sir_init(void)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
return irda_register_dongle(&ma600); return irda_register_dongle(&ma600);
} }
static void __exit ma600_sir_cleanup(void) static void __exit ma600_sir_cleanup(void)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
irda_unregister_dongle(&ma600); irda_unregister_dongle(&ma600);
} }
...@@ -86,8 +84,6 @@ static int ma600_open(struct sir_dev *dev) ...@@ -86,8 +84,6 @@ static int ma600_open(struct sir_dev *dev)
{ {
struct qos_info *qos = &dev->qos; struct qos_info *qos = &dev->qos;
IRDA_DEBUG(2, "%s()\n", __func__);
sirdev_set_dtr_rts(dev, TRUE, TRUE); sirdev_set_dtr_rts(dev, TRUE, TRUE);
/* Explicitly set the speeds we can accept */ /* Explicitly set the speeds we can accept */
...@@ -104,8 +100,6 @@ static int ma600_open(struct sir_dev *dev) ...@@ -104,8 +100,6 @@ static int ma600_open(struct sir_dev *dev)
static int ma600_close(struct sir_dev *dev) static int ma600_close(struct sir_dev *dev)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
/* Power off dongle */ /* Power off dongle */
sirdev_set_dtr_rts(dev, FALSE, FALSE); sirdev_set_dtr_rts(dev, FALSE, FALSE);
...@@ -174,7 +168,7 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -174,7 +168,7 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed)
{ {
u8 byte; u8 byte;
IRDA_DEBUG(2, "%s(), speed=%d (was %d)\n", __func__, pr_debug("%s(), speed=%d (was %d)\n", __func__,
speed, dev->speed); speed, dev->speed);
/* dongle already reset, dongle and port at default speed (9600) */ /* dongle already reset, dongle and port at default speed (9600) */
...@@ -204,7 +198,7 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -204,7 +198,7 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed)
return -1; return -1;
} }
else else
IRDA_DEBUG(2, "%s() control byte write read OK\n", __func__); pr_debug("%s() control byte write read OK\n", __func__);
#endif #endif
/* Set DTR, Set RTS */ /* Set DTR, Set RTS */
...@@ -236,8 +230,6 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -236,8 +230,6 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed)
static int ma600_reset(struct sir_dev *dev) static int ma600_reset(struct sir_dev *dev)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
/* Reset the dongle : set DTR low for 10 ms */ /* Reset the dongle : set DTR low for 10 ms */
sirdev_set_dtr_rts(dev, FALSE, TRUE); sirdev_set_dtr_rts(dev, FALSE, TRUE);
msleep(10); msleep(10);
......
...@@ -63,8 +63,6 @@ static int mcp2120_open(struct sir_dev *dev) ...@@ -63,8 +63,6 @@ static int mcp2120_open(struct sir_dev *dev)
{ {
struct qos_info *qos = &dev->qos; struct qos_info *qos = &dev->qos;
IRDA_DEBUG(2, "%s()\n", __func__);
/* seems no explicit power-on required here and reset switching it on anyway */ /* seems no explicit power-on required here and reset switching it on anyway */
qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200; qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
...@@ -76,8 +74,6 @@ static int mcp2120_open(struct sir_dev *dev) ...@@ -76,8 +74,6 @@ static int mcp2120_open(struct sir_dev *dev)
static int mcp2120_close(struct sir_dev *dev) static int mcp2120_close(struct sir_dev *dev)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
/* Power off dongle */ /* Power off dongle */
/* reset and inhibit mcp2120 */ /* reset and inhibit mcp2120 */
sirdev_set_dtr_rts(dev, TRUE, TRUE); sirdev_set_dtr_rts(dev, TRUE, TRUE);
...@@ -102,8 +98,6 @@ static int mcp2120_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -102,8 +98,6 @@ static int mcp2120_change_speed(struct sir_dev *dev, unsigned speed)
u8 control[2]; u8 control[2];
static int ret = 0; static int ret = 0;
IRDA_DEBUG(2, "%s()\n", __func__);
switch (state) { switch (state) {
case SIRDEV_STATE_DONGLE_SPEED: case SIRDEV_STATE_DONGLE_SPEED:
/* Set DTR to enter command mode */ /* Set DTR to enter command mode */
...@@ -188,8 +182,6 @@ static int mcp2120_reset(struct sir_dev *dev) ...@@ -188,8 +182,6 @@ static int mcp2120_reset(struct sir_dev *dev)
unsigned delay = 0; unsigned delay = 0;
int ret = 0; int ret = 0;
IRDA_DEBUG(2, "%s()\n", __func__);
switch (state) { switch (state) {
case SIRDEV_STATE_DONGLE_RESET: case SIRDEV_STATE_DONGLE_RESET:
//printk("mcp2120_reset: dongle_reset\n"); //printk("mcp2120_reset: dongle_reset\n");
......
...@@ -894,7 +894,7 @@ static int mcs_probe(struct usb_interface *intf, ...@@ -894,7 +894,7 @@ static int mcs_probe(struct usb_interface *intf,
if (!ndev) if (!ndev)
goto error1; goto error1;
IRDA_DEBUG(1, "MCS7780 USB-IrDA bridge found at %d.\n", udev->devnum); pr_debug("MCS7780 USB-IrDA bridge found at %d.\n", udev->devnum);
SET_NETDEV_DEV(ndev, &intf->dev); SET_NETDEV_DEV(ndev, &intf->dev);
...@@ -942,7 +942,7 @@ static int mcs_probe(struct usb_interface *intf, ...@@ -942,7 +942,7 @@ static int mcs_probe(struct usb_interface *intf,
if (ret != 0) if (ret != 0)
goto error2; goto error2;
IRDA_DEBUG(1, "IrDA: Registered MosChip MCS7780 device as %s\n", pr_debug("IrDA: Registered MosChip MCS7780 device as %s\n",
ndev->name); ndev->name);
mcs->transceiver_type = transceiver_type; mcs->transceiver_type = transceiver_type;
...@@ -973,7 +973,7 @@ static void mcs_disconnect(struct usb_interface *intf) ...@@ -973,7 +973,7 @@ static void mcs_disconnect(struct usb_interface *intf)
free_netdev(mcs->netdev); free_netdev(mcs->netdev);
usb_set_intfdata(intf, NULL); usb_set_intfdata(intf, NULL);
IRDA_DEBUG(0, "MCS7780 now disconnected.\n"); pr_debug("MCS7780 now disconnected.\n");
} }
module_usb_driver(mcs_driver); module_usb_driver(mcs_driver);
This diff is collapsed.
...@@ -90,8 +90,6 @@ static int old_belkin_open(struct sir_dev *dev) ...@@ -90,8 +90,6 @@ static int old_belkin_open(struct sir_dev *dev)
{ {
struct qos_info *qos = &dev->qos; struct qos_info *qos = &dev->qos;
IRDA_DEBUG(2, "%s()\n", __func__);
/* Power on dongle */ /* Power on dongle */
sirdev_set_dtr_rts(dev, TRUE, TRUE); sirdev_set_dtr_rts(dev, TRUE, TRUE);
...@@ -108,8 +106,6 @@ static int old_belkin_open(struct sir_dev *dev) ...@@ -108,8 +106,6 @@ static int old_belkin_open(struct sir_dev *dev)
static int old_belkin_close(struct sir_dev *dev) static int old_belkin_close(struct sir_dev *dev)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
/* Power off dongle */ /* Power off dongle */
sirdev_set_dtr_rts(dev, FALSE, FALSE); sirdev_set_dtr_rts(dev, FALSE, FALSE);
...@@ -123,8 +119,6 @@ static int old_belkin_close(struct sir_dev *dev) ...@@ -123,8 +119,6 @@ static int old_belkin_close(struct sir_dev *dev)
*/ */
static int old_belkin_change_speed(struct sir_dev *dev, unsigned speed) static int old_belkin_change_speed(struct sir_dev *dev, unsigned speed)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
dev->speed = 9600; dev->speed = 9600;
return (speed==dev->speed) ? 0 : -EINVAL; return (speed==dev->speed) ? 0 : -EINVAL;
} }
...@@ -137,8 +131,6 @@ static int old_belkin_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -137,8 +131,6 @@ static int old_belkin_change_speed(struct sir_dev *dev, unsigned speed)
*/ */
static int old_belkin_reset(struct sir_dev *dev) static int old_belkin_reset(struct sir_dev *dev)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
/* This dongles speed "defaults" to 9600 bps ;-) */ /* This dongles speed "defaults" to 9600 bps ;-) */
dev->speed = 9600; dev->speed = 9600;
......
...@@ -109,10 +109,10 @@ static void sirdev_config_fsm(struct work_struct *work) ...@@ -109,10 +109,10 @@ static void sirdev_config_fsm(struct work_struct *work)
int ret = -1; int ret = -1;
unsigned delay; unsigned delay;
IRDA_DEBUG(2, "%s(), <%ld>\n", __func__, jiffies); pr_debug("%s(), <%ld>\n", __func__, jiffies);
do { do {
IRDA_DEBUG(3, "%s - state=0x%04x / substate=0x%04x\n", pr_debug("%s - state=0x%04x / substate=0x%04x\n",
__func__, fsm->state, fsm->substate); __func__, fsm->state, fsm->substate);
next_state = fsm->state; next_state = fsm->state;
...@@ -287,12 +287,12 @@ int sirdev_schedule_request(struct sir_dev *dev, int initial_state, unsigned par ...@@ -287,12 +287,12 @@ int sirdev_schedule_request(struct sir_dev *dev, int initial_state, unsigned par
{ {
struct sir_fsm *fsm = &dev->fsm; struct sir_fsm *fsm = &dev->fsm;
IRDA_DEBUG(2, "%s - state=0x%04x / param=%u\n", __func__, pr_debug("%s - state=0x%04x / param=%u\n", __func__,
initial_state, param); initial_state, param);
if (down_trylock(&fsm->sem)) { if (down_trylock(&fsm->sem)) {
if (in_interrupt() || in_atomic() || irqs_disabled()) { if (in_interrupt() || in_atomic() || irqs_disabled()) {
IRDA_DEBUG(1, "%s(), state machine busy!\n", __func__); pr_debug("%s(), state machine busy!\n", __func__);
return -EWOULDBLOCK; return -EWOULDBLOCK;
} else } else
down(&fsm->sem); down(&fsm->sem);
...@@ -345,7 +345,7 @@ int sirdev_set_dongle(struct sir_dev *dev, IRDA_DONGLE type) ...@@ -345,7 +345,7 @@ int sirdev_set_dongle(struct sir_dev *dev, IRDA_DONGLE type)
{ {
int err; int err;
IRDA_DEBUG(3, "%s : requesting dongle %d.\n", __func__, type); pr_debug("%s : requesting dongle %d.\n", __func__, type);
err = sirdev_schedule_dongle_open(dev, type); err = sirdev_schedule_dongle_open(dev, type);
if (unlikely(err)) if (unlikely(err))
...@@ -380,7 +380,7 @@ int sirdev_raw_write(struct sir_dev *dev, const char *buf, int len) ...@@ -380,7 +380,7 @@ int sirdev_raw_write(struct sir_dev *dev, const char *buf, int len)
ret = dev->drv->do_write(dev, dev->tx_buff.data, dev->tx_buff.len); ret = dev->drv->do_write(dev, dev->tx_buff.data, dev->tx_buff.len);
if (ret > 0) { if (ret > 0) {
IRDA_DEBUG(3, "%s(), raw-tx started\n", __func__); pr_debug("%s(), raw-tx started\n", __func__);
dev->tx_buff.data += ret; dev->tx_buff.data += ret;
dev->tx_buff.len -= ret; dev->tx_buff.len -= ret;
...@@ -440,7 +440,7 @@ void sirdev_write_complete(struct sir_dev *dev) ...@@ -440,7 +440,7 @@ void sirdev_write_complete(struct sir_dev *dev)
spin_lock_irqsave(&dev->tx_lock, flags); spin_lock_irqsave(&dev->tx_lock, flags);
IRDA_DEBUG(3, "%s() - dev->tx_buff.len = %d\n", pr_debug("%s() - dev->tx_buff.len = %d\n",
__func__, dev->tx_buff.len); __func__, dev->tx_buff.len);
if (likely(dev->tx_buff.len > 0)) { if (likely(dev->tx_buff.len > 0)) {
...@@ -475,7 +475,7 @@ void sirdev_write_complete(struct sir_dev *dev) ...@@ -475,7 +475,7 @@ void sirdev_write_complete(struct sir_dev *dev)
* restarted when the irda-thread has completed the request. * restarted when the irda-thread has completed the request.
*/ */
IRDA_DEBUG(3, "%s(), raw-tx done\n", __func__); pr_debug("%s(), raw-tx done\n", __func__);
dev->raw_tx = 0; dev->raw_tx = 0;
goto done; /* no post-frame handling in raw mode */ goto done; /* no post-frame handling in raw mode */
} }
...@@ -492,7 +492,7 @@ void sirdev_write_complete(struct sir_dev *dev) ...@@ -492,7 +492,7 @@ void sirdev_write_complete(struct sir_dev *dev)
* re-activated. * re-activated.
*/ */
IRDA_DEBUG(5, "%s(), finished with frame!\n", __func__); pr_debug("%s(), finished with frame!\n", __func__);
if ((skb=dev->tx_skb) != NULL) { if ((skb=dev->tx_skb) != NULL) {
dev->tx_skb = NULL; dev->tx_skb = NULL;
...@@ -502,7 +502,7 @@ void sirdev_write_complete(struct sir_dev *dev) ...@@ -502,7 +502,7 @@ void sirdev_write_complete(struct sir_dev *dev)
} }
if (unlikely(dev->new_speed > 0)) { if (unlikely(dev->new_speed > 0)) {
IRDA_DEBUG(5, "%s(), Changing speed!\n", __func__); pr_debug("%s(), Changing speed!\n", __func__);
err = sirdev_schedule_speed(dev, dev->new_speed); err = sirdev_schedule_speed(dev, dev->new_speed);
if (unlikely(err)) { if (unlikely(err)) {
/* should never happen /* should never happen
...@@ -552,7 +552,7 @@ int sirdev_receive(struct sir_dev *dev, const unsigned char *cp, size_t count) ...@@ -552,7 +552,7 @@ int sirdev_receive(struct sir_dev *dev, const unsigned char *cp, size_t count)
*/ */
irda_device_set_media_busy(dev->netdev, TRUE); irda_device_set_media_busy(dev->netdev, TRUE);
dev->netdev->stats.rx_dropped++; dev->netdev->stats.rx_dropped++;
IRDA_DEBUG(0, "%s; rx-drop: %zd\n", __func__, count); pr_debug("%s; rx-drop: %zd\n", __func__, count);
return 0; return 0;
} }
...@@ -598,7 +598,7 @@ static netdev_tx_t sirdev_hard_xmit(struct sk_buff *skb, ...@@ -598,7 +598,7 @@ static netdev_tx_t sirdev_hard_xmit(struct sk_buff *skb,
netif_stop_queue(ndev); netif_stop_queue(ndev);
IRDA_DEBUG(3, "%s(), skb->len = %d\n", __func__, skb->len); pr_debug("%s(), skb->len = %d\n", __func__, skb->len);
speed = irda_get_next_speed(skb); speed = irda_get_next_speed(skb);
if ((speed != dev->speed) && (speed != -1)) { if ((speed != dev->speed) && (speed != -1)) {
...@@ -635,7 +635,7 @@ static netdev_tx_t sirdev_hard_xmit(struct sk_buff *skb, ...@@ -635,7 +635,7 @@ static netdev_tx_t sirdev_hard_xmit(struct sk_buff *skb,
/* Check problems */ /* Check problems */
if(spin_is_locked(&dev->tx_lock)) { if(spin_is_locked(&dev->tx_lock)) {
IRDA_DEBUG(3, "%s(), write not completed\n", __func__); pr_debug("%s(), write not completed\n", __func__);
} }
/* serialize with write completion */ /* serialize with write completion */
...@@ -684,7 +684,7 @@ static int sirdev_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd) ...@@ -684,7 +684,7 @@ static int sirdev_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
IRDA_ASSERT(dev != NULL, return -1;); IRDA_ASSERT(dev != NULL, return -1;);
IRDA_DEBUG(3, "%s(), %s, (cmd=0x%X)\n", __func__, ndev->name, cmd); pr_debug("%s(), %s, (cmd=0x%X)\n", __func__, ndev->name, cmd);
switch (cmd) { switch (cmd) {
case SIOCSBANDWIDTH: /* Set bandwidth */ case SIOCSBANDWIDTH: /* Set bandwidth */
...@@ -801,8 +801,6 @@ static int sirdev_open(struct net_device *ndev) ...@@ -801,8 +801,6 @@ static int sirdev_open(struct net_device *ndev)
if (!try_module_get(drv->owner)) if (!try_module_get(drv->owner))
return -ESTALE; return -ESTALE;
IRDA_DEBUG(2, "%s()\n", __func__);
if (sirdev_alloc_buffers(dev)) if (sirdev_alloc_buffers(dev))
goto errout_dec; goto errout_dec;
...@@ -819,7 +817,7 @@ static int sirdev_open(struct net_device *ndev) ...@@ -819,7 +817,7 @@ static int sirdev_open(struct net_device *ndev)
netif_wake_queue(ndev); netif_wake_queue(ndev);
IRDA_DEBUG(2, "%s - done, speed = %d\n", __func__, dev->speed); pr_debug("%s - done, speed = %d\n", __func__, dev->speed);
return 0; return 0;
...@@ -839,7 +837,7 @@ static int sirdev_close(struct net_device *ndev) ...@@ -839,7 +837,7 @@ static int sirdev_close(struct net_device *ndev)
struct sir_dev *dev = netdev_priv(ndev); struct sir_dev *dev = netdev_priv(ndev);
const struct sir_driver *drv; const struct sir_driver *drv;
// IRDA_DEBUG(0, "%s\n", __func__); /* pr_debug("%s\n", __func__); */
netif_stop_queue(ndev); netif_stop_queue(ndev);
...@@ -881,7 +879,7 @@ struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *n ...@@ -881,7 +879,7 @@ struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *n
struct net_device *ndev; struct net_device *ndev;
struct sir_dev *dev; struct sir_dev *dev;
IRDA_DEBUG(0, "%s - %s\n", __func__, name); pr_debug("%s - %s\n", __func__, name);
/* instead of adding tests to protect against drv->do_write==NULL /* instead of adding tests to protect against drv->do_write==NULL
* at several places we refuse to create a sir_dev instance for * at several places we refuse to create a sir_dev instance for
...@@ -939,7 +937,7 @@ int sirdev_put_instance(struct sir_dev *dev) ...@@ -939,7 +937,7 @@ int sirdev_put_instance(struct sir_dev *dev)
{ {
int err = 0; int err = 0;
IRDA_DEBUG(0, "%s\n", __func__); pr_debug("%s\n", __func__);
atomic_set(&dev->enable_rx, 0); atomic_set(&dev->enable_rx, 0);
......
...@@ -34,7 +34,7 @@ int irda_register_dongle(struct dongle_driver *new) ...@@ -34,7 +34,7 @@ int irda_register_dongle(struct dongle_driver *new)
struct list_head *entry; struct list_head *entry;
struct dongle_driver *drv; struct dongle_driver *drv;
IRDA_DEBUG(0, "%s : registering dongle \"%s\" (%d).\n", pr_debug("%s : registering dongle \"%s\" (%d).\n",
__func__, new->driver_name, new->type); __func__, new->driver_name, new->type);
mutex_lock(&dongle_list_lock); mutex_lock(&dongle_list_lock);
......
This diff is collapsed.
...@@ -63,7 +63,7 @@ static int __init tekram_sir_init(void) ...@@ -63,7 +63,7 @@ static int __init tekram_sir_init(void)
{ {
if (tekram_delay < 1 || tekram_delay > 500) if (tekram_delay < 1 || tekram_delay > 500)
tekram_delay = 200; tekram_delay = 200;
IRDA_DEBUG(1, "%s - using %d ms delay\n", pr_debug("%s - using %d ms delay\n",
tekram.driver_name, tekram_delay); tekram.driver_name, tekram_delay);
return irda_register_dongle(&tekram); return irda_register_dongle(&tekram);
} }
...@@ -77,8 +77,6 @@ static int tekram_open(struct sir_dev *dev) ...@@ -77,8 +77,6 @@ static int tekram_open(struct sir_dev *dev)
{ {
struct qos_info *qos = &dev->qos; struct qos_info *qos = &dev->qos;
IRDA_DEBUG(2, "%s()\n", __func__);
sirdev_set_dtr_rts(dev, TRUE, TRUE); sirdev_set_dtr_rts(dev, TRUE, TRUE);
qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200; qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
...@@ -92,8 +90,6 @@ static int tekram_open(struct sir_dev *dev) ...@@ -92,8 +90,6 @@ static int tekram_open(struct sir_dev *dev)
static int tekram_close(struct sir_dev *dev) static int tekram_close(struct sir_dev *dev)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
/* Power off dongle */ /* Power off dongle */
sirdev_set_dtr_rts(dev, FALSE, FALSE); sirdev_set_dtr_rts(dev, FALSE, FALSE);
...@@ -130,8 +126,6 @@ static int tekram_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -130,8 +126,6 @@ static int tekram_change_speed(struct sir_dev *dev, unsigned speed)
u8 byte; u8 byte;
static int ret = 0; static int ret = 0;
IRDA_DEBUG(2, "%s()\n", __func__);
switch(state) { switch(state) {
case SIRDEV_STATE_DONGLE_SPEED: case SIRDEV_STATE_DONGLE_SPEED:
...@@ -205,8 +199,6 @@ static int tekram_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -205,8 +199,6 @@ static int tekram_change_speed(struct sir_dev *dev, unsigned speed)
static int tekram_reset(struct sir_dev *dev) static int tekram_reset(struct sir_dev *dev)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
/* Clear DTR, Set RTS */ /* Clear DTR, Set RTS */
sirdev_set_dtr_rts(dev, FALSE, TRUE); sirdev_set_dtr_rts(dev, FALSE, TRUE);
......
...@@ -168,7 +168,7 @@ static int __init toim3232_sir_init(void) ...@@ -168,7 +168,7 @@ static int __init toim3232_sir_init(void)
{ {
if (toim3232delay < 1 || toim3232delay > 500) if (toim3232delay < 1 || toim3232delay > 500)
toim3232delay = 200; toim3232delay = 200;
IRDA_DEBUG(1, "%s - using %d ms delay\n", pr_debug("%s - using %d ms delay\n",
toim3232.driver_name, toim3232delay); toim3232.driver_name, toim3232delay);
return irda_register_dongle(&toim3232); return irda_register_dongle(&toim3232);
} }
...@@ -182,8 +182,6 @@ static int toim3232_open(struct sir_dev *dev) ...@@ -182,8 +182,6 @@ static int toim3232_open(struct sir_dev *dev)
{ {
struct qos_info *qos = &dev->qos; struct qos_info *qos = &dev->qos;
IRDA_DEBUG(2, "%s()\n", __func__);
/* Pull the lines high to start with. /* Pull the lines high to start with.
* *
* For the IR320ST-2, we need to charge the main supply capacitor to * For the IR320ST-2, we need to charge the main supply capacitor to
...@@ -210,8 +208,6 @@ static int toim3232_open(struct sir_dev *dev) ...@@ -210,8 +208,6 @@ static int toim3232_open(struct sir_dev *dev)
static int toim3232_close(struct sir_dev *dev) static int toim3232_close(struct sir_dev *dev)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
/* Power off dongle */ /* Power off dongle */
sirdev_set_dtr_rts(dev, FALSE, FALSE); sirdev_set_dtr_rts(dev, FALSE, FALSE);
...@@ -242,8 +238,6 @@ static int toim3232_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -242,8 +238,6 @@ static int toim3232_change_speed(struct sir_dev *dev, unsigned speed)
u8 byte; u8 byte;
static int ret = 0; static int ret = 0;
IRDA_DEBUG(2, "%s()\n", __func__);
switch(state) { switch(state) {
case SIRDEV_STATE_DONGLE_SPEED: case SIRDEV_STATE_DONGLE_SPEED:
...@@ -345,8 +339,6 @@ static int toim3232_change_speed(struct sir_dev *dev, unsigned speed) ...@@ -345,8 +339,6 @@ static int toim3232_change_speed(struct sir_dev *dev, unsigned speed)
static int toim3232_reset(struct sir_dev *dev) static int toim3232_reset(struct sir_dev *dev)
{ {
IRDA_DEBUG(2, "%s()\n", __func__);
/* Switch off both DTR and RTS to switch off dongle */ /* Switch off both DTR and RTS to switch off dongle */
sirdev_set_dtr_rts(dev, FALSE, FALSE); sirdev_set_dtr_rts(dev, FALSE, FALSE);
......
This diff is collapsed.
...@@ -556,7 +556,7 @@ static int vlsi_process_rx(struct vlsi_ring *r, struct ring_descr *rd) ...@@ -556,7 +556,7 @@ static int vlsi_process_rx(struct vlsi_ring *r, struct ring_descr *rd)
crclen = (idev->mode==IFF_FIR) ? sizeof(u32) : sizeof(u16); crclen = (idev->mode==IFF_FIR) ? sizeof(u32) : sizeof(u16);
len -= crclen; /* remove trailing CRC */ len -= crclen; /* remove trailing CRC */
if (len <= 0) { if (len <= 0) {
IRDA_DEBUG(0, "%s: strange frame (len=%d)\n", __func__, len); pr_debug("%s: strange frame (len=%d)\n", __func__, len);
ret |= VLSI_RX_DROP; ret |= VLSI_RX_DROP;
goto done; goto done;
} }
...@@ -571,7 +571,7 @@ static int vlsi_process_rx(struct vlsi_ring *r, struct ring_descr *rd) ...@@ -571,7 +571,7 @@ static int vlsi_process_rx(struct vlsi_ring *r, struct ring_descr *rd)
*/ */
le16_to_cpus(rd->buf+len); le16_to_cpus(rd->buf+len);
if (irda_calc_crc16(INIT_FCS,rd->buf,len+crclen) != GOOD_FCS) { if (irda_calc_crc16(INIT_FCS,rd->buf,len+crclen) != GOOD_FCS) {
IRDA_DEBUG(0, "%s: crc error\n", __func__); pr_debug("%s: crc error\n", __func__);
ret |= VLSI_RX_CRC; ret |= VLSI_RX_CRC;
goto done; goto done;
} }
...@@ -689,7 +689,7 @@ static void vlsi_unarm_rx(vlsi_irda_dev_t *idev) ...@@ -689,7 +689,7 @@ static void vlsi_unarm_rx(vlsi_irda_dev_t *idev)
if (rd_is_active(rd)) { if (rd_is_active(rd)) {
rd_set_status(rd, 0); rd_set_status(rd, 0);
if (rd_get_count(rd)) { if (rd_get_count(rd)) {
IRDA_DEBUG(0, "%s - dropping rx packet\n", __func__); pr_debug("%s - dropping rx packet\n", __func__);
ret = -VLSI_RX_DROP; ret = -VLSI_RX_DROP;
} }
rd_set_count(rd, 0); rd_set_count(rd, 0);
...@@ -764,7 +764,7 @@ static int vlsi_set_baud(vlsi_irda_dev_t *idev, unsigned iobase) ...@@ -764,7 +764,7 @@ static int vlsi_set_baud(vlsi_irda_dev_t *idev, unsigned iobase)
int fifocnt; int fifocnt;
baudrate = idev->new_baud; baudrate = idev->new_baud;
IRDA_DEBUG(2, "%s: %d -> %d\n", __func__, idev->baud, idev->new_baud); pr_debug("%s: %d -> %d\n", __func__, idev->baud, idev->new_baud);
if (baudrate == 4000000) { if (baudrate == 4000000) {
mode = IFF_FIR; mode = IFF_FIR;
config = IRCFG_FIR; config = IRCFG_FIR;
...@@ -798,7 +798,7 @@ static int vlsi_set_baud(vlsi_irda_dev_t *idev, unsigned iobase) ...@@ -798,7 +798,7 @@ static int vlsi_set_baud(vlsi_irda_dev_t *idev, unsigned iobase)
fifocnt = inw(iobase+VLSI_PIO_RCVBCNT) & RCVBCNT_MASK; fifocnt = inw(iobase+VLSI_PIO_RCVBCNT) & RCVBCNT_MASK;
if (fifocnt != 0) { if (fifocnt != 0) {
IRDA_DEBUG(0, "%s: rx fifo not empty(%d)\n", __func__, fifocnt); pr_debug("%s: rx fifo not empty(%d)\n", __func__, fifocnt);
} }
outw(0, iobase+VLSI_PIO_IRENABLE); outw(0, iobase+VLSI_PIO_IRENABLE);
...@@ -1022,7 +1022,8 @@ static netdev_tx_t vlsi_hard_start_xmit(struct sk_buff *skb, ...@@ -1022,7 +1022,8 @@ static netdev_tx_t vlsi_hard_start_xmit(struct sk_buff *skb,
fifocnt = inw(ndev->base_addr+VLSI_PIO_RCVBCNT) & RCVBCNT_MASK; fifocnt = inw(ndev->base_addr+VLSI_PIO_RCVBCNT) & RCVBCNT_MASK;
if (fifocnt != 0) { if (fifocnt != 0) {
IRDA_DEBUG(0, "%s: rx fifo not empty(%d)\n", __func__, fifocnt); pr_debug("%s: rx fifo not empty(%d)\n",
__func__, fifocnt);
} }
config = inw(iobase+VLSI_PIO_IRCFG); config = inw(iobase+VLSI_PIO_IRCFG);
...@@ -1034,7 +1035,7 @@ static netdev_tx_t vlsi_hard_start_xmit(struct sk_buff *skb, ...@@ -1034,7 +1035,7 @@ static netdev_tx_t vlsi_hard_start_xmit(struct sk_buff *skb,
if (ring_put(r) == NULL) { if (ring_put(r) == NULL) {
netif_stop_queue(ndev); netif_stop_queue(ndev);
IRDA_DEBUG(3, "%s: tx ring full - queue stopped\n", __func__); pr_debug("%s: tx ring full - queue stopped\n", __func__);
} }
spin_unlock_irqrestore(&idev->lock, flags); spin_unlock_irqrestore(&idev->lock, flags);
...@@ -1099,7 +1100,7 @@ static void vlsi_tx_interrupt(struct net_device *ndev) ...@@ -1099,7 +1100,7 @@ static void vlsi_tx_interrupt(struct net_device *ndev)
fifocnt = inw(iobase+VLSI_PIO_RCVBCNT) & RCVBCNT_MASK; fifocnt = inw(iobase+VLSI_PIO_RCVBCNT) & RCVBCNT_MASK;
if (fifocnt != 0) { if (fifocnt != 0) {
IRDA_DEBUG(0, "%s: rx fifo not empty(%d)\n", pr_debug("%s: rx fifo not empty(%d)\n",
__func__, fifocnt); __func__, fifocnt);
} }
outw(config | IRCFG_ENTX, iobase+VLSI_PIO_IRCFG); outw(config | IRCFG_ENTX, iobase+VLSI_PIO_IRCFG);
...@@ -1109,7 +1110,7 @@ static void vlsi_tx_interrupt(struct net_device *ndev) ...@@ -1109,7 +1110,7 @@ static void vlsi_tx_interrupt(struct net_device *ndev)
if (netif_queue_stopped(ndev) && !idev->new_baud) { if (netif_queue_stopped(ndev) && !idev->new_baud) {
netif_wake_queue(ndev); netif_wake_queue(ndev);
IRDA_DEBUG(3, "%s: queue awoken\n", __func__); pr_debug("%s: queue awoken\n", __func__);
} }
} }
...@@ -1133,7 +1134,7 @@ static void vlsi_unarm_tx(vlsi_irda_dev_t *idev) ...@@ -1133,7 +1134,7 @@ static void vlsi_unarm_tx(vlsi_irda_dev_t *idev)
dev_kfree_skb_any(rd->skb); dev_kfree_skb_any(rd->skb);
rd->skb = NULL; rd->skb = NULL;
} }
IRDA_DEBUG(0, "%s - dropping tx packet\n", __func__); pr_debug("%s - dropping tx packet\n", __func__);
ret = -VLSI_TX_DROP; ret = -VLSI_TX_DROP;
} }
else else
...@@ -1191,7 +1192,7 @@ static int vlsi_start_clock(struct pci_dev *pdev) ...@@ -1191,7 +1192,7 @@ static int vlsi_start_clock(struct pci_dev *pdev)
else /* was: clksrc=0(auto) */ else /* was: clksrc=0(auto) */
clksrc = 3; /* fallback to 40MHz XCLK (OB800) */ clksrc = 3; /* fallback to 40MHz XCLK (OB800) */
IRDA_DEBUG(0, "%s: PLL not locked, fallback to clksrc=%d\n", pr_debug("%s: PLL not locked, fallback to clksrc=%d\n",
__func__, clksrc); __func__, clksrc);
} }
else else
......
...@@ -110,8 +110,6 @@ static int __init w83977af_init(void) ...@@ -110,8 +110,6 @@ static int __init w83977af_init(void)
{ {
int i; int i;
IRDA_DEBUG(0, "%s()\n", __func__ );
for (i=0; i < ARRAY_SIZE(dev_self) && io[i] < 2000; i++) { for (i=0; i < ARRAY_SIZE(dev_self) && io[i] < 2000; i++) {
if (w83977af_open(i, io[i], irq[i], dma[i]) == 0) if (w83977af_open(i, io[i], irq[i], dma[i]) == 0)
return 0; return 0;
...@@ -129,8 +127,6 @@ static void __exit w83977af_cleanup(void) ...@@ -129,8 +127,6 @@ static void __exit w83977af_cleanup(void)
{ {
int i; int i;
IRDA_DEBUG(4, "%s()\n", __func__ );
for (i=0; i < ARRAY_SIZE(dev_self); i++) { for (i=0; i < ARRAY_SIZE(dev_self); i++) {
if (dev_self[i]) if (dev_self[i])
w83977af_close(dev_self[i]); w83977af_close(dev_self[i]);
...@@ -157,11 +153,9 @@ static int w83977af_open(int i, unsigned int iobase, unsigned int irq, ...@@ -157,11 +153,9 @@ static int w83977af_open(int i, unsigned int iobase, unsigned int irq,
struct w83977af_ir *self; struct w83977af_ir *self;
int err; int err;
IRDA_DEBUG(0, "%s()\n", __func__ );
/* Lock the port that we need */ /* Lock the port that we need */
if (!request_region(iobase, CHIP_IO_EXTENT, driver_name)) { if (!request_region(iobase, CHIP_IO_EXTENT, driver_name)) {
IRDA_DEBUG(0, "%s(), can't get iobase of 0x%03x\n", pr_debug("%s(), can't get iobase of 0x%03x\n",
__func__ , iobase); __func__ , iobase);
return -ENODEV; return -ENODEV;
} }
...@@ -269,8 +263,6 @@ static int w83977af_close(struct w83977af_ir *self) ...@@ -269,8 +263,6 @@ static int w83977af_close(struct w83977af_ir *self)
{ {
int iobase; int iobase;
IRDA_DEBUG(0, "%s()\n", __func__ );
iobase = self->io.fir_base; iobase = self->io.fir_base;
#ifdef CONFIG_USE_W977_PNP #ifdef CONFIG_USE_W977_PNP
...@@ -289,7 +281,7 @@ static int w83977af_close(struct w83977af_ir *self) ...@@ -289,7 +281,7 @@ static int w83977af_close(struct w83977af_ir *self)
unregister_netdev(self->netdev); unregister_netdev(self->netdev);
/* Release the PORT that this driver is using */ /* Release the PORT that this driver is using */
IRDA_DEBUG(0 , "%s(), Releasing Region %03x\n", pr_debug("%s(), Releasing Region %03x\n",
__func__ , self->io.fir_base); __func__ , self->io.fir_base);
release_region(self->io.fir_base, self->io.fir_ext); release_region(self->io.fir_base, self->io.fir_ext);
...@@ -312,7 +304,6 @@ static int w83977af_probe(int iobase, int irq, int dma) ...@@ -312,7 +304,6 @@ static int w83977af_probe(int iobase, int irq, int dma)
int i; int i;
for (i=0; i < 2; i++) { for (i=0; i < 2; i++) {
IRDA_DEBUG( 0, "%s()\n", __func__ );
#ifdef CONFIG_USE_W977_PNP #ifdef CONFIG_USE_W977_PNP
/* Enter PnP configuration mode */ /* Enter PnP configuration mode */
w977_efm_enter(efbase[i]); w977_efm_enter(efbase[i]);
...@@ -399,7 +390,7 @@ static int w83977af_probe(int iobase, int irq, int dma) ...@@ -399,7 +390,7 @@ static int w83977af_probe(int iobase, int irq, int dma)
return 0; return 0;
} else { } else {
/* Try next extented function register address */ /* Try next extented function register address */
IRDA_DEBUG( 0, "%s(), Wrong chip version", __func__ ); pr_debug("%s(), Wrong chip version", __func__);
} }
} }
return -1; return -1;
...@@ -435,19 +426,19 @@ static void w83977af_change_speed(struct w83977af_ir *self, __u32 speed) ...@@ -435,19 +426,19 @@ static void w83977af_change_speed(struct w83977af_ir *self, __u32 speed)
case 115200: outb(0x01, iobase+ABLL); break; case 115200: outb(0x01, iobase+ABLL); break;
case 576000: case 576000:
ir_mode = HCR_MIR_576; ir_mode = HCR_MIR_576;
IRDA_DEBUG(0, "%s(), handling baud of 576000\n", __func__ ); pr_debug("%s(), handling baud of 576000\n", __func__);
break; break;
case 1152000: case 1152000:
ir_mode = HCR_MIR_1152; ir_mode = HCR_MIR_1152;
IRDA_DEBUG(0, "%s(), handling baud of 1152000\n", __func__ ); pr_debug("%s(), handling baud of 1152000\n", __func__);
break; break;
case 4000000: case 4000000:
ir_mode = HCR_FIR; ir_mode = HCR_FIR;
IRDA_DEBUG(0, "%s(), handling baud of 4000000\n", __func__ ); pr_debug("%s(), handling baud of 4000000\n", __func__);
break; break;
default: default:
ir_mode = HCR_FIR; ir_mode = HCR_FIR;
IRDA_DEBUG(0, "%s(), unknown baud rate of %d\n", __func__ , speed); pr_debug("%s(), unknown baud rate of %d\n", __func__ , speed);
break; break;
} }
...@@ -498,8 +489,8 @@ static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb, ...@@ -498,8 +489,8 @@ static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb,
iobase = self->io.fir_base; iobase = self->io.fir_base;
IRDA_DEBUG(4, "%s(%ld), skb->len=%d\n", __func__ , jiffies, pr_debug("%s(%ld), skb->len=%d\n", __func__ , jiffies,
(int) skb->len); (int)skb->len);
/* Lock transmit buffer */ /* Lock transmit buffer */
netif_stop_queue(dev); netif_stop_queue(dev);
...@@ -526,7 +517,7 @@ static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb, ...@@ -526,7 +517,7 @@ static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb,
self->tx_buff.len = skb->len; self->tx_buff.len = skb->len;
mtt = irda_get_mtt(skb); mtt = irda_get_mtt(skb);
IRDA_DEBUG(4, "%s(%ld), mtt=%d\n", __func__ , jiffies, mtt); pr_debug("%s(%ld), mtt=%d\n", __func__ , jiffies, mtt);
if (mtt) if (mtt)
udelay(mtt); udelay(mtt);
...@@ -560,7 +551,7 @@ static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb, ...@@ -560,7 +551,7 @@ static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb,
static void w83977af_dma_write(struct w83977af_ir *self, int iobase) static void w83977af_dma_write(struct w83977af_ir *self, int iobase)
{ {
__u8 set; __u8 set;
IRDA_DEBUG(4, "%s(), len=%d\n", __func__ , self->tx_buff.len); pr_debug("%s(), len=%d\n", __func__ , self->tx_buff.len);
/* Save current set */ /* Save current set */
set = inb(iobase+SSR); set = inb(iobase+SSR);
...@@ -595,18 +586,15 @@ static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size) ...@@ -595,18 +586,15 @@ static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size)
int actual = 0; int actual = 0;
__u8 set; __u8 set;
IRDA_DEBUG(4, "%s()\n", __func__ );
/* Save current bank */ /* Save current bank */
set = inb(iobase+SSR); set = inb(iobase+SSR);
switch_bank(iobase, SET0); switch_bank(iobase, SET0);
if (!(inb_p(iobase+USR) & USR_TSRE)) { if (!(inb_p(iobase+USR) & USR_TSRE)) {
IRDA_DEBUG(4, pr_debug("%s(), warning, FIFO not empty yet!\n", __func__);
"%s(), warning, FIFO not empty yet!\n", __func__ );
fifo_size -= 17; fifo_size -= 17;
IRDA_DEBUG(4, "%s(), %d bytes left in tx fifo\n", pr_debug("%s(), %d bytes left in tx fifo\n",
__func__ , fifo_size); __func__ , fifo_size);
} }
...@@ -616,7 +604,7 @@ static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size) ...@@ -616,7 +604,7 @@ static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size)
outb(buf[actual++], iobase+TBR); outb(buf[actual++], iobase+TBR);
} }
IRDA_DEBUG(4, "%s(), fifo_size %d ; %d sent of %d\n", pr_debug("%s(), fifo_size %d ; %d sent of %d\n",
__func__ , fifo_size, actual, len); __func__ , fifo_size, actual, len);
/* Restore bank */ /* Restore bank */
...@@ -637,7 +625,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self) ...@@ -637,7 +625,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self)
int iobase; int iobase;
__u8 set; __u8 set;
IRDA_DEBUG(4, "%s(%ld)\n", __func__ , jiffies); pr_debug("%s(%ld)\n", __func__ , jiffies);
IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self != NULL, return;);
...@@ -652,7 +640,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self) ...@@ -652,7 +640,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self)
/* Check for underrun! */ /* Check for underrun! */
if (inb(iobase+AUDR) & AUDR_UNDR) { if (inb(iobase+AUDR) & AUDR_UNDR) {
IRDA_DEBUG(0, "%s(), Transmit underrun!\n", __func__ ); pr_debug("%s(), Transmit underrun!\n", __func__);
self->netdev->stats.tx_errors++; self->netdev->stats.tx_errors++;
self->netdev->stats.tx_fifo_errors++; self->netdev->stats.tx_fifo_errors++;
...@@ -693,7 +681,7 @@ static int w83977af_dma_receive(struct w83977af_ir *self) ...@@ -693,7 +681,7 @@ static int w83977af_dma_receive(struct w83977af_ir *self)
#endif #endif
IRDA_ASSERT(self != NULL, return -1;); IRDA_ASSERT(self != NULL, return -1;);
IRDA_DEBUG(4, "%s\n", __func__ ); pr_debug("%s\n", __func__);
iobase= self->io.fir_base; iobase= self->io.fir_base;
...@@ -764,7 +752,7 @@ static int w83977af_dma_receive_complete(struct w83977af_ir *self) ...@@ -764,7 +752,7 @@ static int w83977af_dma_receive_complete(struct w83977af_ir *self)
__u8 set; __u8 set;
__u8 status; __u8 status;
IRDA_DEBUG(4, "%s\n", __func__ ); pr_debug("%s\n", __func__);
st_fifo = &self->st_fifo; st_fifo = &self->st_fifo;
...@@ -881,8 +869,6 @@ static void w83977af_pio_receive(struct w83977af_ir *self) ...@@ -881,8 +869,6 @@ static void w83977af_pio_receive(struct w83977af_ir *self)
__u8 byte = 0x00; __u8 byte = 0x00;
int iobase; int iobase;
IRDA_DEBUG(4, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self != NULL, return;);
iobase = self->io.fir_base; iobase = self->io.fir_base;
...@@ -908,7 +894,7 @@ static __u8 w83977af_sir_interrupt(struct w83977af_ir *self, int isr) ...@@ -908,7 +894,7 @@ static __u8 w83977af_sir_interrupt(struct w83977af_ir *self, int isr)
__u8 set; __u8 set;
int iobase; int iobase;
IRDA_DEBUG(4, "%s(), isr=%#x\n", __func__ , isr); pr_debug("%s(), isr=%#x\n", __func__ , isr);
iobase = self->io.fir_base; iobase = self->io.fir_base;
/* Transmit FIFO low on data */ /* Transmit FIFO low on data */
...@@ -944,8 +930,7 @@ static __u8 w83977af_sir_interrupt(struct w83977af_ir *self, int isr) ...@@ -944,8 +930,7 @@ static __u8 w83977af_sir_interrupt(struct w83977af_ir *self, int isr)
if (isr & ISR_TXEMP_I) { if (isr & ISR_TXEMP_I) {
/* Check if we need to change the speed? */ /* Check if we need to change the speed? */
if (self->new_speed) { if (self->new_speed) {
IRDA_DEBUG(2, pr_debug("%s(), Changing speed!\n", __func__);
"%s(), Changing speed!\n", __func__ );
w83977af_change_speed(self, self->new_speed); w83977af_change_speed(self, self->new_speed);
self->new_speed = 0; self->new_speed = 0;
} }
...@@ -1127,7 +1112,6 @@ static int w83977af_net_open(struct net_device *dev) ...@@ -1127,7 +1112,6 @@ static int w83977af_net_open(struct net_device *dev)
char hwname[32]; char hwname[32];
__u8 set; __u8 set;
IRDA_DEBUG(0, "%s()\n", __func__ );
IRDA_ASSERT(dev != NULL, return -1;); IRDA_ASSERT(dev != NULL, return -1;);
self = netdev_priv(dev); self = netdev_priv(dev);
...@@ -1190,8 +1174,6 @@ static int w83977af_net_close(struct net_device *dev) ...@@ -1190,8 +1174,6 @@ static int w83977af_net_close(struct net_device *dev)
int iobase; int iobase;
__u8 set; __u8 set;
IRDA_DEBUG(0, "%s()\n", __func__ );
IRDA_ASSERT(dev != NULL, return -1;); IRDA_ASSERT(dev != NULL, return -1;);
self = netdev_priv(dev); self = netdev_priv(dev);
...@@ -1245,7 +1227,7 @@ static int w83977af_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -1245,7 +1227,7 @@ static int w83977af_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(2, "%s(), %s, (cmd=0x%X)\n", __func__ , dev->name, cmd); pr_debug("%s(), %s, (cmd=0x%X)\n", __func__ , dev->name, cmd);
spin_lock_irqsave(&self->lock, flags); spin_lock_irqsave(&self->lock, flags);
......
...@@ -55,16 +55,6 @@ typedef __u32 magic_t; ...@@ -55,16 +55,6 @@ typedef __u32 magic_t;
#endif #endif
#ifdef CONFIG_IRDA_DEBUG #ifdef CONFIG_IRDA_DEBUG
extern unsigned int irda_debug;
/* use 0 for production, 1 for verification, >2 for debug */
#define IRDA_DEBUG_LEVEL 0
#define IRDA_DEBUG(n, args...) \
do { if (irda_debug >= (n)) \
printk(KERN_DEBUG args); \
} while (0)
#define IRDA_ASSERT(expr, func) \ #define IRDA_ASSERT(expr, func) \
do { if(!(expr)) { \ do { if(!(expr)) { \
printk( "Assertion failed! %s:%s:%d %s\n", \ printk( "Assertion failed! %s:%s:%d %s\n", \
...@@ -72,7 +62,6 @@ do { if(!(expr)) { \ ...@@ -72,7 +62,6 @@ do { if(!(expr)) { \
func } } while (0) func } } while (0)
#define IRDA_ASSERT_LABEL(label) label #define IRDA_ASSERT_LABEL(label) label
#else #else
#define IRDA_DEBUG(n, args...) do { } while (0)
#define IRDA_ASSERT(expr, func) do { (void)(expr); } while (0) #define IRDA_ASSERT(expr, func) do { (void)(expr); } while (0)
#define IRDA_ASSERT_LABEL(label) #define IRDA_ASSERT_LABEL(label)
#endif /* CONFIG_IRDA_DEBUG */ #endif /* CONFIG_IRDA_DEBUG */
......
...@@ -303,7 +303,7 @@ static inline void irlap_next_state(struct irlap_cb *self, IRLAP_STATE state) ...@@ -303,7 +303,7 @@ static inline void irlap_next_state(struct irlap_cb *self, IRLAP_STATE state)
if (!self || self->magic != LAP_MAGIC) if (!self || self->magic != LAP_MAGIC)
return; return;
IRDA_DEBUG(4, "next LAP state = %s\n", irlap_state[state]); pr_debug("next LAP state = %s\n", irlap_state[state]);
*/ */
self->state = state; self->state = state;
} }
......
This diff is collapsed.
...@@ -112,8 +112,6 @@ void irlmp_add_discovery_log(hashbin_t *cachelog, hashbin_t *log) ...@@ -112,8 +112,6 @@ void irlmp_add_discovery_log(hashbin_t *cachelog, hashbin_t *log)
{ {
discovery_t *discovery; discovery_t *discovery;
IRDA_DEBUG(4, "%s()\n", __func__);
/* /*
* If log is missing this means that IrLAP was unable to perform the * If log is missing this means that IrLAP was unable to perform the
* discovery, so restart discovery again with just the half timeout * discovery, so restart discovery again with just the half timeout
...@@ -159,8 +157,6 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force) ...@@ -159,8 +157,6 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force)
int i = 0; /* How many we expired */ int i = 0; /* How many we expired */
IRDA_ASSERT(log != NULL, return;); IRDA_ASSERT(log != NULL, return;);
IRDA_DEBUG(4, "%s()\n", __func__);
spin_lock_irqsave(&log->hb_spinlock, flags); spin_lock_irqsave(&log->hb_spinlock, flags);
discovery = (discovery_t *) hashbin_get_first(log); discovery = (discovery_t *) hashbin_get_first(log);
...@@ -232,10 +228,10 @@ void irlmp_dump_discoveries(hashbin_t *log) ...@@ -232,10 +228,10 @@ void irlmp_dump_discoveries(hashbin_t *log)
discovery = (discovery_t *) hashbin_get_first(log); discovery = (discovery_t *) hashbin_get_first(log);
while (discovery != NULL) { while (discovery != NULL) {
IRDA_DEBUG(0, "Discovery:\n"); pr_debug("Discovery:\n");
IRDA_DEBUG(0, " daddr=%08x\n", discovery->data.daddr); pr_debug(" daddr=%08x\n", discovery->data.daddr);
IRDA_DEBUG(0, " saddr=%08x\n", discovery->data.saddr); pr_debug(" saddr=%08x\n", discovery->data.saddr);
IRDA_DEBUG(0, " nickname=%s\n", discovery->data.info); pr_debug(" nickname=%s\n", discovery->data.info);
discovery = (discovery_t *) hashbin_get_next(log); discovery = (discovery_t *) hashbin_get_next(log);
} }
......
...@@ -91,8 +91,6 @@ static int __init ircomm_init(void) ...@@ -91,8 +91,6 @@ static int __init ircomm_init(void)
static void __exit ircomm_cleanup(void) static void __exit ircomm_cleanup(void)
{ {
IRDA_DEBUG(2, "%s()\n", __func__ );
hashbin_delete(ircomm, (FREE_FUNC) __ircomm_close); hashbin_delete(ircomm, (FREE_FUNC) __ircomm_close);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
...@@ -111,7 +109,7 @@ struct ircomm_cb *ircomm_open(notify_t *notify, __u8 service_type, int line) ...@@ -111,7 +109,7 @@ struct ircomm_cb *ircomm_open(notify_t *notify, __u8 service_type, int line)
struct ircomm_cb *self = NULL; struct ircomm_cb *self = NULL;
int ret; int ret;
IRDA_DEBUG(2, "%s(), service_type=0x%02x\n", __func__ , pr_debug("%s(), service_type=0x%02x\n", __func__ ,
service_type); service_type);
IRDA_ASSERT(ircomm != NULL, return NULL;); IRDA_ASSERT(ircomm != NULL, return NULL;);
...@@ -155,8 +153,6 @@ EXPORT_SYMBOL(ircomm_open); ...@@ -155,8 +153,6 @@ EXPORT_SYMBOL(ircomm_open);
*/ */
static int __ircomm_close(struct ircomm_cb *self) static int __ircomm_close(struct ircomm_cb *self)
{ {
IRDA_DEBUG(2, "%s()\n", __func__ );
/* Disconnect link if any */ /* Disconnect link if any */
ircomm_do_event(self, IRCOMM_DISCONNECT_REQUEST, NULL, NULL); ircomm_do_event(self, IRCOMM_DISCONNECT_REQUEST, NULL, NULL);
...@@ -191,8 +187,6 @@ int ircomm_close(struct ircomm_cb *self) ...@@ -191,8 +187,6 @@ int ircomm_close(struct ircomm_cb *self)
IRDA_ASSERT(self != NULL, return -EIO;); IRDA_ASSERT(self != NULL, return -EIO;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -EIO;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -EIO;);
IRDA_DEBUG(0, "%s()\n", __func__ );
entry = hashbin_remove(ircomm, self->line, NULL); entry = hashbin_remove(ircomm, self->line, NULL);
IRDA_ASSERT(entry == self, return -1;); IRDA_ASSERT(entry == self, return -1;);
...@@ -216,8 +210,6 @@ int ircomm_connect_request(struct ircomm_cb *self, __u8 dlsap_sel, ...@@ -216,8 +210,6 @@ int ircomm_connect_request(struct ircomm_cb *self, __u8 dlsap_sel,
struct ircomm_info info; struct ircomm_info info;
int ret; int ret;
IRDA_DEBUG(2 , "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return -1;); IRDA_ASSERT(self != NULL, return -1;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
...@@ -243,8 +235,6 @@ EXPORT_SYMBOL(ircomm_connect_request); ...@@ -243,8 +235,6 @@ EXPORT_SYMBOL(ircomm_connect_request);
void ircomm_connect_indication(struct ircomm_cb *self, struct sk_buff *skb, void ircomm_connect_indication(struct ircomm_cb *self, struct sk_buff *skb,
struct ircomm_info *info) struct ircomm_info *info)
{ {
IRDA_DEBUG(2, "%s()\n", __func__ );
/* /*
* If there are any data hiding in the control channel, we must * If there are any data hiding in the control channel, we must
* deliver it first. The side effect is that the control channel * deliver it first. The side effect is that the control channel
...@@ -255,7 +245,7 @@ void ircomm_connect_indication(struct ircomm_cb *self, struct sk_buff *skb, ...@@ -255,7 +245,7 @@ void ircomm_connect_indication(struct ircomm_cb *self, struct sk_buff *skb,
info->qos, info->max_data_size, info->qos, info->max_data_size,
info->max_header_size, skb); info->max_header_size, skb);
else { else {
IRDA_DEBUG(0, "%s(), missing handler\n", __func__ ); pr_debug("%s(), missing handler\n", __func__);
} }
} }
...@@ -272,8 +262,6 @@ int ircomm_connect_response(struct ircomm_cb *self, struct sk_buff *userdata) ...@@ -272,8 +262,6 @@ int ircomm_connect_response(struct ircomm_cb *self, struct sk_buff *userdata)
IRDA_ASSERT(self != NULL, return -1;); IRDA_ASSERT(self != NULL, return -1;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
IRDA_DEBUG(4, "%s()\n", __func__ );
ret = ircomm_do_event(self, IRCOMM_CONNECT_RESPONSE, userdata, NULL); ret = ircomm_do_event(self, IRCOMM_CONNECT_RESPONSE, userdata, NULL);
return ret; return ret;
...@@ -290,15 +278,13 @@ EXPORT_SYMBOL(ircomm_connect_response); ...@@ -290,15 +278,13 @@ EXPORT_SYMBOL(ircomm_connect_response);
void ircomm_connect_confirm(struct ircomm_cb *self, struct sk_buff *skb, void ircomm_connect_confirm(struct ircomm_cb *self, struct sk_buff *skb,
struct ircomm_info *info) struct ircomm_info *info)
{ {
IRDA_DEBUG(4, "%s()\n", __func__ );
if (self->notify.connect_confirm ) if (self->notify.connect_confirm )
self->notify.connect_confirm(self->notify.instance, self->notify.connect_confirm(self->notify.instance,
self, info->qos, self, info->qos,
info->max_data_size, info->max_data_size,
info->max_header_size, skb); info->max_header_size, skb);
else { else {
IRDA_DEBUG(0, "%s(), missing handler\n", __func__ ); pr_debug("%s(), missing handler\n", __func__);
} }
} }
...@@ -312,8 +298,6 @@ int ircomm_data_request(struct ircomm_cb *self, struct sk_buff *skb) ...@@ -312,8 +298,6 @@ int ircomm_data_request(struct ircomm_cb *self, struct sk_buff *skb)
{ {
int ret; int ret;
IRDA_DEBUG(4, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return -EFAULT;); IRDA_ASSERT(self != NULL, return -EFAULT;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;);
IRDA_ASSERT(skb != NULL, return -EFAULT;); IRDA_ASSERT(skb != NULL, return -EFAULT;);
...@@ -333,14 +317,12 @@ EXPORT_SYMBOL(ircomm_data_request); ...@@ -333,14 +317,12 @@ EXPORT_SYMBOL(ircomm_data_request);
*/ */
void ircomm_data_indication(struct ircomm_cb *self, struct sk_buff *skb) void ircomm_data_indication(struct ircomm_cb *self, struct sk_buff *skb)
{ {
IRDA_DEBUG(4, "%s()\n", __func__ );
IRDA_ASSERT(skb->len > 0, return;); IRDA_ASSERT(skb->len > 0, return;);
if (self->notify.data_indication) if (self->notify.data_indication)
self->notify.data_indication(self->notify.instance, self, skb); self->notify.data_indication(self->notify.instance, self, skb);
else { else {
IRDA_DEBUG(0, "%s(), missing handler\n", __func__ ); pr_debug("%s(), missing handler\n", __func__);
} }
} }
...@@ -365,8 +347,8 @@ void ircomm_process_data(struct ircomm_cb *self, struct sk_buff *skb) ...@@ -365,8 +347,8 @@ void ircomm_process_data(struct ircomm_cb *self, struct sk_buff *skb)
* fine * fine
*/ */
if (unlikely(skb->len < (clen + 1))) { if (unlikely(skb->len < (clen + 1))) {
IRDA_DEBUG(2, "%s() throwing away illegal frame\n", pr_debug("%s() throwing away illegal frame\n",
__func__ ); __func__);
return; return;
} }
...@@ -384,8 +366,8 @@ void ircomm_process_data(struct ircomm_cb *self, struct sk_buff *skb) ...@@ -384,8 +366,8 @@ void ircomm_process_data(struct ircomm_cb *self, struct sk_buff *skb)
if (skb->len) if (skb->len)
ircomm_data_indication(self, skb); ircomm_data_indication(self, skb);
else { else {
IRDA_DEBUG(4, "%s(), data was control info only!\n", pr_debug("%s(), data was control info only!\n",
__func__ ); __func__);
} }
} }
...@@ -399,8 +381,6 @@ int ircomm_control_request(struct ircomm_cb *self, struct sk_buff *skb) ...@@ -399,8 +381,6 @@ int ircomm_control_request(struct ircomm_cb *self, struct sk_buff *skb)
{ {
int ret; int ret;
IRDA_DEBUG(2, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return -EFAULT;); IRDA_ASSERT(self != NULL, return -EFAULT;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;);
IRDA_ASSERT(skb != NULL, return -EFAULT;); IRDA_ASSERT(skb != NULL, return -EFAULT;);
...@@ -421,8 +401,6 @@ EXPORT_SYMBOL(ircomm_control_request); ...@@ -421,8 +401,6 @@ EXPORT_SYMBOL(ircomm_control_request);
static void ircomm_control_indication(struct ircomm_cb *self, static void ircomm_control_indication(struct ircomm_cb *self,
struct sk_buff *skb, int clen) struct sk_buff *skb, int clen)
{ {
IRDA_DEBUG(2, "%s()\n", __func__ );
/* Use udata for delivering data on the control channel */ /* Use udata for delivering data on the control channel */
if (self->notify.udata_indication) { if (self->notify.udata_indication) {
struct sk_buff *ctrl_skb; struct sk_buff *ctrl_skb;
...@@ -442,7 +420,7 @@ static void ircomm_control_indication(struct ircomm_cb *self, ...@@ -442,7 +420,7 @@ static void ircomm_control_indication(struct ircomm_cb *self,
* see ircomm_tty_control_indication(). */ * see ircomm_tty_control_indication(). */
dev_kfree_skb(ctrl_skb); dev_kfree_skb(ctrl_skb);
} else { } else {
IRDA_DEBUG(0, "%s(), missing handler\n", __func__ ); pr_debug("%s(), missing handler\n", __func__);
} }
} }
...@@ -457,8 +435,6 @@ int ircomm_disconnect_request(struct ircomm_cb *self, struct sk_buff *userdata) ...@@ -457,8 +435,6 @@ int ircomm_disconnect_request(struct ircomm_cb *self, struct sk_buff *userdata)
struct ircomm_info info; struct ircomm_info info;
int ret; int ret;
IRDA_DEBUG(2, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return -1;); IRDA_ASSERT(self != NULL, return -1;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
...@@ -478,15 +454,13 @@ EXPORT_SYMBOL(ircomm_disconnect_request); ...@@ -478,15 +454,13 @@ EXPORT_SYMBOL(ircomm_disconnect_request);
void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb, void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb,
struct ircomm_info *info) struct ircomm_info *info)
{ {
IRDA_DEBUG(2, "%s()\n", __func__ );
IRDA_ASSERT(info != NULL, return;); IRDA_ASSERT(info != NULL, return;);
if (self->notify.disconnect_indication) { if (self->notify.disconnect_indication) {
self->notify.disconnect_indication(self->notify.instance, self, self->notify.disconnect_indication(self->notify.instance, self,
info->reason, skb); info->reason, skb);
} else { } else {
IRDA_DEBUG(0, "%s(), missing handler\n", __func__ ); pr_debug("%s(), missing handler\n", __func__);
} }
} }
...@@ -498,8 +472,6 @@ void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb, ...@@ -498,8 +472,6 @@ void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb,
*/ */
void ircomm_flow_request(struct ircomm_cb *self, LOCAL_FLOW flow) void ircomm_flow_request(struct ircomm_cb *self, LOCAL_FLOW flow)
{ {
IRDA_DEBUG(2, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
......
...@@ -106,7 +106,7 @@ static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event, ...@@ -106,7 +106,7 @@ static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event,
ircomm_connect_indication(self, skb, info); ircomm_connect_indication(self, skb, info);
break; break;
default: default:
IRDA_DEBUG(4, "%s(), unknown event: %s\n", __func__ , pr_debug("%s(), unknown event: %s\n", __func__ ,
ircomm_event[event]); ircomm_event[event]);
ret = -EINVAL; ret = -EINVAL;
} }
...@@ -136,7 +136,7 @@ static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event, ...@@ -136,7 +136,7 @@ static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event,
ircomm_disconnect_indication(self, skb, info); ircomm_disconnect_indication(self, skb, info);
break; break;
default: default:
IRDA_DEBUG(0, "%s(), unknown event: %s\n", __func__ , pr_debug("%s(), unknown event: %s\n", __func__ ,
ircomm_event[event]); ircomm_event[event]);
ret = -EINVAL; ret = -EINVAL;
} }
...@@ -169,7 +169,7 @@ static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event, ...@@ -169,7 +169,7 @@ static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event,
ircomm_disconnect_indication(self, skb, info); ircomm_disconnect_indication(self, skb, info);
break; break;
default: default:
IRDA_DEBUG(0, "%s(), unknown event = %s\n", __func__ , pr_debug("%s(), unknown event = %s\n", __func__ ,
ircomm_event[event]); ircomm_event[event]);
ret = -EINVAL; ret = -EINVAL;
} }
...@@ -211,7 +211,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event, ...@@ -211,7 +211,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event,
ret = self->issue.disconnect_request(self, skb, info); ret = self->issue.disconnect_request(self, skb, info);
break; break;
default: default:
IRDA_DEBUG(0, "%s(), unknown event = %s\n", __func__ , pr_debug("%s(), unknown event = %s\n", __func__ ,
ircomm_event[event]); ircomm_event[event]);
ret = -EINVAL; ret = -EINVAL;
} }
...@@ -227,7 +227,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event, ...@@ -227,7 +227,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event,
int ircomm_do_event(struct ircomm_cb *self, IRCOMM_EVENT event, int ircomm_do_event(struct ircomm_cb *self, IRCOMM_EVENT event,
struct sk_buff *skb, struct ircomm_info *info) struct sk_buff *skb, struct ircomm_info *info)
{ {
IRDA_DEBUG(4, "%s: state=%s, event=%s\n", __func__ , pr_debug("%s: state=%s, event=%s\n", __func__ ,
ircomm_state[self->state], ircomm_event[event]); ircomm_state[self->state], ircomm_event[event]);
return (*state[self->state])(self, event, skb, info); return (*state[self->state])(self, event, skb, info);
...@@ -243,6 +243,6 @@ void ircomm_next_state(struct ircomm_cb *self, IRCOMM_STATE state) ...@@ -243,6 +243,6 @@ void ircomm_next_state(struct ircomm_cb *self, IRCOMM_STATE state)
{ {
self->state = state; self->state = state;
IRDA_DEBUG(4, "%s: next state=%s, service type=%d\n", __func__ , pr_debug("%s: next state=%s, service type=%d\n", __func__ ,
ircomm_state[self->state], self->service_type); ircomm_state[self->state], self->service_type);
} }
...@@ -52,8 +52,6 @@ static int ircomm_lmp_connect_request(struct ircomm_cb *self, ...@@ -52,8 +52,6 @@ static int ircomm_lmp_connect_request(struct ircomm_cb *self,
{ {
int ret = 0; int ret = 0;
IRDA_DEBUG(0, "%s()\n", __func__ );
/* Don't forget to refcount it - should be NULL anyway */ /* Don't forget to refcount it - should be NULL anyway */
if(userdata) if(userdata)
skb_get(userdata); skb_get(userdata);
...@@ -74,8 +72,6 @@ static int ircomm_lmp_connect_response(struct ircomm_cb *self, ...@@ -74,8 +72,6 @@ static int ircomm_lmp_connect_response(struct ircomm_cb *self,
{ {
struct sk_buff *tx_skb; struct sk_buff *tx_skb;
IRDA_DEBUG(0, "%s()\n", __func__ );
/* Any userdata supplied? */ /* Any userdata supplied? */
if (userdata == NULL) { if (userdata == NULL) {
tx_skb = alloc_skb(LMP_MAX_HEADER, GFP_ATOMIC); tx_skb = alloc_skb(LMP_MAX_HEADER, GFP_ATOMIC);
...@@ -107,8 +103,6 @@ static int ircomm_lmp_disconnect_request(struct ircomm_cb *self, ...@@ -107,8 +103,6 @@ static int ircomm_lmp_disconnect_request(struct ircomm_cb *self,
struct sk_buff *tx_skb; struct sk_buff *tx_skb;
int ret; int ret;
IRDA_DEBUG(0, "%s()\n", __func__ );
if (!userdata) { if (!userdata) {
tx_skb = alloc_skb(LMP_MAX_HEADER, GFP_ATOMIC); tx_skb = alloc_skb(LMP_MAX_HEADER, GFP_ATOMIC);
if (!tx_skb) if (!tx_skb)
...@@ -144,13 +138,11 @@ static void ircomm_lmp_flow_control(struct sk_buff *skb) ...@@ -144,13 +138,11 @@ static void ircomm_lmp_flow_control(struct sk_buff *skb)
cb = (struct irda_skb_cb *) skb->cb; cb = (struct irda_skb_cb *) skb->cb;
IRDA_DEBUG(2, "%s()\n", __func__ );
line = cb->line; line = cb->line;
self = (struct ircomm_cb *) hashbin_lock_find(ircomm, line, NULL); self = (struct ircomm_cb *) hashbin_lock_find(ircomm, line, NULL);
if (!self) { if (!self) {
IRDA_DEBUG(2, "%s(), didn't find myself\n", __func__ ); pr_debug("%s(), didn't find myself\n", __func__);
return; return;
} }
...@@ -160,7 +152,7 @@ static void ircomm_lmp_flow_control(struct sk_buff *skb) ...@@ -160,7 +152,7 @@ static void ircomm_lmp_flow_control(struct sk_buff *skb)
self->pkt_count--; self->pkt_count--;
if ((self->pkt_count < 2) && (self->flow_status == FLOW_STOP)) { if ((self->pkt_count < 2) && (self->flow_status == FLOW_STOP)) {
IRDA_DEBUG(2, "%s(), asking TTY to start again!\n", __func__ ); pr_debug("%s(), asking TTY to start again!\n", __func__);
self->flow_status = FLOW_START; self->flow_status = FLOW_START;
if (self->notify.flow_indication) if (self->notify.flow_indication)
self->notify.flow_indication(self->notify.instance, self->notify.flow_indication(self->notify.instance,
...@@ -187,7 +179,7 @@ static int ircomm_lmp_data_request(struct ircomm_cb *self, ...@@ -187,7 +179,7 @@ static int ircomm_lmp_data_request(struct ircomm_cb *self,
cb->line = self->line; cb->line = self->line;
IRDA_DEBUG(4, "%s(), sending frame\n", __func__ ); pr_debug("%s(), sending frame\n", __func__);
/* Don't forget to refcount it - see ircomm_tty_do_softint() */ /* Don't forget to refcount it - see ircomm_tty_do_softint() */
skb_get(skb); skb_get(skb);
...@@ -196,7 +188,7 @@ static int ircomm_lmp_data_request(struct ircomm_cb *self, ...@@ -196,7 +188,7 @@ static int ircomm_lmp_data_request(struct ircomm_cb *self,
skb->destructor = ircomm_lmp_flow_control; skb->destructor = ircomm_lmp_flow_control;
if ((self->pkt_count++ > 7) && (self->flow_status == FLOW_START)) { if ((self->pkt_count++ > 7) && (self->flow_status == FLOW_START)) {
IRDA_DEBUG(2, "%s(), asking TTY to slow down!\n", __func__ ); pr_debug("%s(), asking TTY to slow down!\n", __func__);
self->flow_status = FLOW_STOP; self->flow_status = FLOW_STOP;
if (self->notify.flow_indication) if (self->notify.flow_indication)
self->notify.flow_indication(self->notify.instance, self->notify.flow_indication(self->notify.instance,
...@@ -222,8 +214,6 @@ static int ircomm_lmp_data_indication(void *instance, void *sap, ...@@ -222,8 +214,6 @@ static int ircomm_lmp_data_indication(void *instance, void *sap,
{ {
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
IRDA_DEBUG(4, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return -1;); IRDA_ASSERT(self != NULL, return -1;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
IRDA_ASSERT(skb != NULL, return -1;); IRDA_ASSERT(skb != NULL, return -1;);
...@@ -252,8 +242,6 @@ static void ircomm_lmp_connect_confirm(void *instance, void *sap, ...@@ -252,8 +242,6 @@ static void ircomm_lmp_connect_confirm(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
struct ircomm_info info; struct ircomm_info info;
IRDA_DEBUG(0, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
IRDA_ASSERT(skb != NULL, return;); IRDA_ASSERT(skb != NULL, return;);
...@@ -285,8 +273,6 @@ static void ircomm_lmp_connect_indication(void *instance, void *sap, ...@@ -285,8 +273,6 @@ static void ircomm_lmp_connect_indication(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *)instance; struct ircomm_cb *self = (struct ircomm_cb *)instance;
struct ircomm_info info; struct ircomm_info info;
IRDA_DEBUG(0, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
IRDA_ASSERT(skb != NULL, return;); IRDA_ASSERT(skb != NULL, return;);
...@@ -315,8 +301,6 @@ static void ircomm_lmp_disconnect_indication(void *instance, void *sap, ...@@ -315,8 +301,6 @@ static void ircomm_lmp_disconnect_indication(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
struct ircomm_info info; struct ircomm_info info;
IRDA_DEBUG(0, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
...@@ -338,8 +322,6 @@ int ircomm_open_lsap(struct ircomm_cb *self) ...@@ -338,8 +322,6 @@ int ircomm_open_lsap(struct ircomm_cb *self)
{ {
notify_t notify; notify_t notify;
IRDA_DEBUG(0, "%s()\n", __func__ );
/* Register callbacks */ /* Register callbacks */
irda_notify_init(&notify); irda_notify_init(&notify);
notify.data_indication = ircomm_lmp_data_indication; notify.data_indication = ircomm_lmp_data_indication;
...@@ -351,7 +333,7 @@ int ircomm_open_lsap(struct ircomm_cb *self) ...@@ -351,7 +333,7 @@ int ircomm_open_lsap(struct ircomm_cb *self)
self->lsap = irlmp_open_lsap(LSAP_ANY, &notify, 0); self->lsap = irlmp_open_lsap(LSAP_ANY, &notify, 0);
if (!self->lsap) { if (!self->lsap) {
IRDA_DEBUG(0,"%sfailed to allocate tsap\n", __func__ ); pr_debug("%sfailed to allocate tsap\n", __func__);
return -1; return -1;
} }
self->slsap_sel = self->lsap->slsap_sel; self->slsap_sel = self->lsap->slsap_sel;
......
...@@ -101,8 +101,6 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush) ...@@ -101,8 +101,6 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
struct sk_buff *skb; struct sk_buff *skb;
int count; int count;
IRDA_DEBUG(2, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return -1;); IRDA_ASSERT(self != NULL, return -1;);
IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;); IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
...@@ -139,7 +137,7 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush) ...@@ -139,7 +137,7 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
spin_unlock_irqrestore(&self->spinlock, flags); spin_unlock_irqrestore(&self->spinlock, flags);
IRDA_DEBUG(2, "%s(), skb->len=%d\n", __func__ , skb->len); pr_debug("%s(), skb->len=%d\n", __func__ , skb->len);
if (flush) { if (flush) {
/* ircomm_tty_do_softint will take care of the rest */ /* ircomm_tty_do_softint will take care of the rest */
...@@ -173,11 +171,10 @@ static int ircomm_param_service_type(void *instance, irda_param_t *param, ...@@ -173,11 +171,10 @@ static int ircomm_param_service_type(void *instance, irda_param_t *param,
/* Find all common service types */ /* Find all common service types */
service_type &= self->service_type; service_type &= self->service_type;
if (!service_type) { if (!service_type) {
IRDA_DEBUG(2, pr_debug("%s(), No common service type to use!\n", __func__);
"%s(), No common service type to use!\n", __func__ );
return -1; return -1;
} }
IRDA_DEBUG(0, "%s(), services in common=%02x\n", __func__ , pr_debug("%s(), services in common=%02x\n", __func__ ,
service_type); service_type);
/* /*
...@@ -192,7 +189,7 @@ static int ircomm_param_service_type(void *instance, irda_param_t *param, ...@@ -192,7 +189,7 @@ static int ircomm_param_service_type(void *instance, irda_param_t *param,
else if (service_type & IRCOMM_3_WIRE_RAW) else if (service_type & IRCOMM_3_WIRE_RAW)
self->settings.service_type = IRCOMM_3_WIRE_RAW; self->settings.service_type = IRCOMM_3_WIRE_RAW;
IRDA_DEBUG(0, "%s(), resulting service type=0x%02x\n", __func__ , pr_debug("%s(), resulting service type=0x%02x\n", __func__ ,
self->settings.service_type); self->settings.service_type);
/* /*
...@@ -235,7 +232,7 @@ static int ircomm_param_port_type(void *instance, irda_param_t *param, int get) ...@@ -235,7 +232,7 @@ static int ircomm_param_port_type(void *instance, irda_param_t *param, int get)
else { else {
self->settings.port_type = (__u8) param->pv.i; self->settings.port_type = (__u8) param->pv.i;
IRDA_DEBUG(0, "%s(), port type=%d\n", __func__ , pr_debug("%s(), port type=%d\n", __func__ ,
self->settings.port_type); self->settings.port_type);
} }
return 0; return 0;
...@@ -255,9 +252,9 @@ static int ircomm_param_port_name(void *instance, irda_param_t *param, int get) ...@@ -255,9 +252,9 @@ static int ircomm_param_port_name(void *instance, irda_param_t *param, int get)
IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;); IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
if (get) { if (get) {
IRDA_DEBUG(0, "%s(), not imp!\n", __func__ ); pr_debug("%s(), not imp!\n", __func__);
} else { } else {
IRDA_DEBUG(0, "%s(), port-name=%s\n", __func__ , param->pv.c); pr_debug("%s(), port-name=%s\n", __func__ , param->pv.c);
strncpy(self->settings.port_name, param->pv.c, 32); strncpy(self->settings.port_name, param->pv.c, 32);
} }
...@@ -282,7 +279,7 @@ static int ircomm_param_data_rate(void *instance, irda_param_t *param, int get) ...@@ -282,7 +279,7 @@ static int ircomm_param_data_rate(void *instance, irda_param_t *param, int get)
else else
self->settings.data_rate = param->pv.i; self->settings.data_rate = param->pv.i;
IRDA_DEBUG(2, "%s(), data rate = %d\n", __func__ , param->pv.i); pr_debug("%s(), data rate = %d\n", __func__ , param->pv.i);
return 0; return 0;
} }
...@@ -328,7 +325,7 @@ static int ircomm_param_flow_control(void *instance, irda_param_t *param, ...@@ -328,7 +325,7 @@ static int ircomm_param_flow_control(void *instance, irda_param_t *param,
else else
self->settings.flow_control = (__u8) param->pv.i; self->settings.flow_control = (__u8) param->pv.i;
IRDA_DEBUG(1, "%s(), flow control = 0x%02x\n", __func__ , (__u8) param->pv.i); pr_debug("%s(), flow control = 0x%02x\n", __func__ , (__u8)param->pv.i);
return 0; return 0;
} }
...@@ -354,7 +351,7 @@ static int ircomm_param_xon_xoff(void *instance, irda_param_t *param, int get) ...@@ -354,7 +351,7 @@ static int ircomm_param_xon_xoff(void *instance, irda_param_t *param, int get)
self->settings.xonxoff[1] = (__u16) param->pv.i >> 8; self->settings.xonxoff[1] = (__u16) param->pv.i >> 8;
} }
IRDA_DEBUG(0, "%s(), XON/XOFF = 0x%02x,0x%02x\n", __func__ , pr_debug("%s(), XON/XOFF = 0x%02x,0x%02x\n", __func__ ,
param->pv.i & 0xff, param->pv.i >> 8); param->pv.i & 0xff, param->pv.i >> 8);
return 0; return 0;
...@@ -381,7 +378,7 @@ static int ircomm_param_enq_ack(void *instance, irda_param_t *param, int get) ...@@ -381,7 +378,7 @@ static int ircomm_param_enq_ack(void *instance, irda_param_t *param, int get)
self->settings.enqack[1] = (__u16) param->pv.i >> 8; self->settings.enqack[1] = (__u16) param->pv.i >> 8;
} }
IRDA_DEBUG(0, "%s(), ENQ/ACK = 0x%02x,0x%02x\n", __func__ , pr_debug("%s(), ENQ/ACK = 0x%02x,0x%02x\n", __func__ ,
param->pv.i & 0xff, param->pv.i >> 8); param->pv.i & 0xff, param->pv.i >> 8);
return 0; return 0;
...@@ -396,7 +393,7 @@ static int ircomm_param_enq_ack(void *instance, irda_param_t *param, int get) ...@@ -396,7 +393,7 @@ static int ircomm_param_enq_ack(void *instance, irda_param_t *param, int get)
static int ircomm_param_line_status(void *instance, irda_param_t *param, static int ircomm_param_line_status(void *instance, irda_param_t *param,
int get) int get)
{ {
IRDA_DEBUG(2, "%s(), not impl.\n", __func__ ); pr_debug("%s(), not impl.\n", __func__);
return 0; return 0;
} }
...@@ -457,7 +454,7 @@ static int ircomm_param_dce(void *instance, irda_param_t *param, int get) ...@@ -457,7 +454,7 @@ static int ircomm_param_dce(void *instance, irda_param_t *param, int get)
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance; struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
__u8 dce; __u8 dce;
IRDA_DEBUG(1, "%s(), dce = 0x%02x\n", __func__ , (__u8) param->pv.i); pr_debug("%s(), dce = 0x%02x\n", __func__ , (__u8)param->pv.i);
dce = (__u8) param->pv.i; dce = (__u8) param->pv.i;
...@@ -469,7 +466,7 @@ static int ircomm_param_dce(void *instance, irda_param_t *param, int get) ...@@ -469,7 +466,7 @@ static int ircomm_param_dce(void *instance, irda_param_t *param, int get)
/* Check if any of the settings have changed */ /* Check if any of the settings have changed */
if (dce & 0x0f) { if (dce & 0x0f) {
if (dce & IRCOMM_DELTA_CTS) { if (dce & IRCOMM_DELTA_CTS) {
IRDA_DEBUG(2, "%s(), CTS\n", __func__ ); pr_debug("%s(), CTS\n", __func__);
} }
} }
......
...@@ -76,8 +76,6 @@ int ircomm_open_tsap(struct ircomm_cb *self) ...@@ -76,8 +76,6 @@ int ircomm_open_tsap(struct ircomm_cb *self)
{ {
notify_t notify; notify_t notify;
IRDA_DEBUG(4, "%s()\n", __func__ );
/* Register callbacks */ /* Register callbacks */
irda_notify_init(&notify); irda_notify_init(&notify);
notify.data_indication = ircomm_ttp_data_indication; notify.data_indication = ircomm_ttp_data_indication;
...@@ -91,7 +89,7 @@ int ircomm_open_tsap(struct ircomm_cb *self) ...@@ -91,7 +89,7 @@ int ircomm_open_tsap(struct ircomm_cb *self)
self->tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, self->tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT,
&notify); &notify);
if (!self->tsap) { if (!self->tsap) {
IRDA_DEBUG(0, "%sfailed to allocate tsap\n", __func__ ); pr_debug("%sfailed to allocate tsap\n", __func__);
return -1; return -1;
} }
self->slsap_sel = self->tsap->stsap_sel; self->slsap_sel = self->tsap->stsap_sel;
...@@ -119,8 +117,6 @@ static int ircomm_ttp_connect_request(struct ircomm_cb *self, ...@@ -119,8 +117,6 @@ static int ircomm_ttp_connect_request(struct ircomm_cb *self,
{ {
int ret = 0; int ret = 0;
IRDA_DEBUG(4, "%s()\n", __func__ );
/* Don't forget to refcount it - should be NULL anyway */ /* Don't forget to refcount it - should be NULL anyway */
if(userdata) if(userdata)
skb_get(userdata); skb_get(userdata);
...@@ -143,8 +139,6 @@ static int ircomm_ttp_connect_response(struct ircomm_cb *self, ...@@ -143,8 +139,6 @@ static int ircomm_ttp_connect_response(struct ircomm_cb *self,
{ {
int ret; int ret;
IRDA_DEBUG(4, "%s()\n", __func__ );
/* Don't forget to refcount it - should be NULL anyway */ /* Don't forget to refcount it - should be NULL anyway */
if(userdata) if(userdata)
skb_get(userdata); skb_get(userdata);
...@@ -171,7 +165,7 @@ static int ircomm_ttp_data_request(struct ircomm_cb *self, ...@@ -171,7 +165,7 @@ static int ircomm_ttp_data_request(struct ircomm_cb *self,
IRDA_ASSERT(skb != NULL, return -1;); IRDA_ASSERT(skb != NULL, return -1;);
IRDA_DEBUG(2, "%s(), clen=%d\n", __func__ , clen); pr_debug("%s(), clen=%d\n", __func__ , clen);
/* /*
* Insert clen field, currently we either send data only, or control * Insert clen field, currently we either send data only, or control
...@@ -206,8 +200,6 @@ static int ircomm_ttp_data_indication(void *instance, void *sap, ...@@ -206,8 +200,6 @@ static int ircomm_ttp_data_indication(void *instance, void *sap,
{ {
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
IRDA_DEBUG(4, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return -1;); IRDA_ASSERT(self != NULL, return -1;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
IRDA_ASSERT(skb != NULL, return -1;); IRDA_ASSERT(skb != NULL, return -1;);
...@@ -229,8 +221,6 @@ static void ircomm_ttp_connect_confirm(void *instance, void *sap, ...@@ -229,8 +221,6 @@ static void ircomm_ttp_connect_confirm(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
struct ircomm_info info; struct ircomm_info info;
IRDA_DEBUG(4, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
IRDA_ASSERT(skb != NULL, return;); IRDA_ASSERT(skb != NULL, return;);
...@@ -270,8 +260,6 @@ static void ircomm_ttp_connect_indication(void *instance, void *sap, ...@@ -270,8 +260,6 @@ static void ircomm_ttp_connect_indication(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *)instance; struct ircomm_cb *self = (struct ircomm_cb *)instance;
struct ircomm_info info; struct ircomm_info info;
IRDA_DEBUG(4, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
IRDA_ASSERT(skb != NULL, return;); IRDA_ASSERT(skb != NULL, return;);
...@@ -329,8 +317,6 @@ static void ircomm_ttp_disconnect_indication(void *instance, void *sap, ...@@ -329,8 +317,6 @@ static void ircomm_ttp_disconnect_indication(void *instance, void *sap,
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
struct ircomm_info info; struct ircomm_info info;
IRDA_DEBUG(2, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
...@@ -354,8 +340,6 @@ static void ircomm_ttp_flow_indication(void *instance, void *sap, ...@@ -354,8 +340,6 @@ static void ircomm_ttp_flow_indication(void *instance, void *sap,
{ {
struct ircomm_cb *self = (struct ircomm_cb *) instance; struct ircomm_cb *self = (struct ircomm_cb *) instance;
IRDA_DEBUG(4, "%s()\n", __func__ );
IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
......
This diff is collapsed.
This diff is collapsed.
...@@ -56,8 +56,6 @@ static void ircomm_tty_change_speed(struct ircomm_tty_cb *self, ...@@ -56,8 +56,6 @@ static void ircomm_tty_change_speed(struct ircomm_tty_cb *self,
unsigned int cflag, cval; unsigned int cflag, cval;
int baud; int baud;
IRDA_DEBUG(2, "%s()\n", __func__ );
if (!self->ircomm) if (!self->ircomm)
return; return;
...@@ -150,8 +148,6 @@ void ircomm_tty_set_termios(struct tty_struct *tty, ...@@ -150,8 +148,6 @@ void ircomm_tty_set_termios(struct tty_struct *tty,
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
unsigned int cflag = tty->termios.c_cflag; unsigned int cflag = tty->termios.c_cflag;
IRDA_DEBUG(2, "%s()\n", __func__ );
if ((cflag == old_termios->c_cflag) && if ((cflag == old_termios->c_cflag) &&
(RELEVANT_IFLAG(tty->termios.c_iflag) == (RELEVANT_IFLAG(tty->termios.c_iflag) ==
RELEVANT_IFLAG(old_termios->c_iflag))) RELEVANT_IFLAG(old_termios->c_iflag)))
...@@ -199,8 +195,6 @@ int ircomm_tty_tiocmget(struct tty_struct *tty) ...@@ -199,8 +195,6 @@ int ircomm_tty_tiocmget(struct tty_struct *tty)
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
unsigned int result; unsigned int result;
IRDA_DEBUG(2, "%s()\n", __func__ );
if (tty->flags & (1 << TTY_IO_ERROR)) if (tty->flags & (1 << TTY_IO_ERROR))
return -EIO; return -EIO;
...@@ -224,8 +218,6 @@ int ircomm_tty_tiocmset(struct tty_struct *tty, ...@@ -224,8 +218,6 @@ int ircomm_tty_tiocmset(struct tty_struct *tty,
{ {
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
IRDA_DEBUG(2, "%s()\n", __func__ );
if (tty->flags & (1 << TTY_IO_ERROR)) if (tty->flags & (1 << TTY_IO_ERROR))
return -EIO; return -EIO;
...@@ -266,8 +258,6 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self, ...@@ -266,8 +258,6 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
if (!retinfo) if (!retinfo)
return -EFAULT; return -EFAULT;
IRDA_DEBUG(2, "%s()\n", __func__ );
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
info.line = self->line; info.line = self->line;
info.flags = self->port.flags; info.flags = self->port.flags;
...@@ -302,8 +292,6 @@ static int ircomm_tty_set_serial_info(struct ircomm_tty_cb *self, ...@@ -302,8 +292,6 @@ static int ircomm_tty_set_serial_info(struct ircomm_tty_cb *self,
struct serial_struct new_serial; struct serial_struct new_serial;
struct ircomm_tty_cb old_state, *state; struct ircomm_tty_cb old_state, *state;
IRDA_DEBUG(0, "%s()\n", __func__ );
if (copy_from_user(&new_serial,new_info,sizeof(new_serial))) if (copy_from_user(&new_serial,new_info,sizeof(new_serial)))
return -EFAULT; return -EFAULT;
...@@ -376,8 +364,6 @@ int ircomm_tty_ioctl(struct tty_struct *tty, ...@@ -376,8 +364,6 @@ int ircomm_tty_ioctl(struct tty_struct *tty,
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
int ret = 0; int ret = 0;
IRDA_DEBUG(2, "%s()\n", __func__ );
if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
(cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) && (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) &&
(cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) { (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
...@@ -393,11 +379,11 @@ int ircomm_tty_ioctl(struct tty_struct *tty, ...@@ -393,11 +379,11 @@ int ircomm_tty_ioctl(struct tty_struct *tty,
ret = ircomm_tty_set_serial_info(self, (struct serial_struct __user *) arg); ret = ircomm_tty_set_serial_info(self, (struct serial_struct __user *) arg);
break; break;
case TIOCMIWAIT: case TIOCMIWAIT:
IRDA_DEBUG(0, "(), TIOCMIWAIT, not impl!\n"); pr_debug("(), TIOCMIWAIT, not impl!\n");
break; break;
case TIOCGICOUNT: case TIOCGICOUNT:
IRDA_DEBUG(0, "%s(), TIOCGICOUNT not impl!\n", __func__ ); pr_debug("%s(), TIOCGICOUNT not impl!\n", __func__);
#if 0 #if 0
save_flags(flags); cli(); save_flags(flags); cli();
cnow = driver->icount; cnow = driver->icount;
......
...@@ -90,8 +90,6 @@ static void leftover_dongle(void *arg) ...@@ -90,8 +90,6 @@ static void leftover_dongle(void *arg)
void irda_device_cleanup(void) void irda_device_cleanup(void)
{ {
IRDA_DEBUG(4, "%s()\n", __func__);
hashbin_delete(tasks, (FREE_FUNC) __irda_task_delete); hashbin_delete(tasks, (FREE_FUNC) __irda_task_delete);
hashbin_delete(dongles, leftover_dongle); hashbin_delete(dongles, leftover_dongle);
...@@ -107,7 +105,7 @@ void irda_device_set_media_busy(struct net_device *dev, int status) ...@@ -107,7 +105,7 @@ void irda_device_set_media_busy(struct net_device *dev, int status)
{ {
struct irlap_cb *self; struct irlap_cb *self;
IRDA_DEBUG(4, "%s(%s)\n", __func__, status ? "TRUE" : "FALSE"); pr_debug("%s(%s)\n", __func__, status ? "TRUE" : "FALSE");
self = (struct irlap_cb *) dev->atalk_ptr; self = (struct irlap_cb *) dev->atalk_ptr;
...@@ -127,7 +125,7 @@ void irda_device_set_media_busy(struct net_device *dev, int status) ...@@ -127,7 +125,7 @@ void irda_device_set_media_busy(struct net_device *dev, int status)
irlap_start_mbusy_timer(self, SMALLBUSY_TIMEOUT); irlap_start_mbusy_timer(self, SMALLBUSY_TIMEOUT);
else else
irlap_start_mbusy_timer(self, MEDIABUSY_TIMEOUT); irlap_start_mbusy_timer(self, MEDIABUSY_TIMEOUT);
IRDA_DEBUG( 4, "Media busy!\n"); pr_debug("Media busy!\n");
} else { } else {
self->media_busy = FALSE; self->media_busy = FALSE;
irlap_stop_mbusy_timer(self); irlap_stop_mbusy_timer(self);
...@@ -147,8 +145,6 @@ int irda_device_is_receiving(struct net_device *dev) ...@@ -147,8 +145,6 @@ int irda_device_is_receiving(struct net_device *dev)
struct if_irda_req req; struct if_irda_req req;
int ret; int ret;
IRDA_DEBUG(2, "%s()\n", __func__);
if (!dev->netdev_ops->ndo_do_ioctl) { if (!dev->netdev_ops->ndo_do_ioctl) {
net_err_ratelimited("%s: do_ioctl not impl. by device driver\n", net_err_ratelimited("%s: do_ioctl not impl. by device driver\n",
__func__); __func__);
...@@ -192,8 +188,6 @@ static int irda_task_kick(struct irda_task *task) ...@@ -192,8 +188,6 @@ static int irda_task_kick(struct irda_task *task)
int count = 0; int count = 0;
int timeout; int timeout;
IRDA_DEBUG(2, "%s()\n", __func__);
IRDA_ASSERT(task != NULL, return -1;); IRDA_ASSERT(task != NULL, return -1;);
IRDA_ASSERT(task->magic == IRDA_TASK_MAGIC, return -1;); IRDA_ASSERT(task->magic == IRDA_TASK_MAGIC, return -1;);
...@@ -241,7 +235,7 @@ static int irda_task_kick(struct irda_task *task) ...@@ -241,7 +235,7 @@ static int irda_task_kick(struct irda_task *task)
irda_task_timer_expired); irda_task_timer_expired);
finished = FALSE; finished = FALSE;
} else { } else {
IRDA_DEBUG(0, "%s(), not finished, and no timeout!\n", pr_debug("%s(), not finished, and no timeout!\n",
__func__); __func__);
finished = FALSE; finished = FALSE;
} }
...@@ -259,8 +253,6 @@ static void irda_task_timer_expired(void *data) ...@@ -259,8 +253,6 @@ static void irda_task_timer_expired(void *data)
{ {
struct irda_task *task; struct irda_task *task;
IRDA_DEBUG(2, "%s()\n", __func__);
task = data; task = data;
irda_task_kick(task); irda_task_kick(task);
......
This diff is collapsed.
This diff is collapsed.
...@@ -48,8 +48,6 @@ struct ias_object *irias_new_object( char *name, int id) ...@@ -48,8 +48,6 @@ struct ias_object *irias_new_object( char *name, int id)
{ {
struct ias_object *obj; struct ias_object *obj;
IRDA_DEBUG( 4, "%s()\n", __func__);
obj = kzalloc(sizeof(struct ias_object), GFP_ATOMIC); obj = kzalloc(sizeof(struct ias_object), GFP_ATOMIC);
if (obj == NULL) { if (obj == NULL) {
net_warn_ratelimited("%s(), Unable to allocate object!\n", net_warn_ratelimited("%s(), Unable to allocate object!\n",
...@@ -134,7 +132,7 @@ int irias_delete_object(struct ias_object *obj) ...@@ -134,7 +132,7 @@ int irias_delete_object(struct ias_object *obj)
/* Remove from list */ /* Remove from list */
node = hashbin_remove_this(irias_objects, (irda_queue_t *) obj); node = hashbin_remove_this(irias_objects, (irda_queue_t *) obj);
if (!node) if (!node)
IRDA_DEBUG( 0, "%s(), object already removed!\n", pr_debug("%s(), object already removed!\n",
__func__); __func__);
/* Destroy */ /* Destroy */
...@@ -287,7 +285,7 @@ int irias_object_change_attribute(char *obj_name, char *attrib_name, ...@@ -287,7 +285,7 @@ int irias_object_change_attribute(char *obj_name, char *attrib_name,
} }
if ( attrib->value->type != new_value->type) { if ( attrib->value->type != new_value->type) {
IRDA_DEBUG( 0, "%s(), changing value type not allowed!\n", pr_debug("%s(), changing value type not allowed!\n",
__func__); __func__);
spin_unlock_irqrestore(&obj->attribs->hb_spinlock, flags); spin_unlock_irqrestore(&obj->attribs->hb_spinlock, flags);
return -1; return -1;
...@@ -533,8 +531,6 @@ struct ias_value *irias_new_missing_value(void) ...@@ -533,8 +531,6 @@ struct ias_value *irias_new_missing_value(void)
*/ */
void irias_delete_value(struct ias_value *value) void irias_delete_value(struct ias_value *value)
{ {
IRDA_DEBUG(4, "%s()\n", __func__);
IRDA_ASSERT(value != NULL, return;); IRDA_ASSERT(value != NULL, return;);
switch (value->type) { switch (value->type) {
...@@ -551,7 +547,7 @@ void irias_delete_value(struct ias_value *value) ...@@ -551,7 +547,7 @@ void irias_delete_value(struct ias_value *value)
kfree(value->t.oct_seq); kfree(value->t.oct_seq);
break; break;
default: default:
IRDA_DEBUG(0, "%s(), Unknown value type!\n", __func__); pr_debug("%s(), Unknown value type!\n", __func__);
break; break;
} }
kfree(value); kfree(value);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -40,7 +40,7 @@ const char * const irlan_state[] = { ...@@ -40,7 +40,7 @@ const char * const irlan_state[] = {
void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state) void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
{ {
IRDA_DEBUG(2, "%s(), %s\n", __func__ , irlan_state[state]); pr_debug("%s(), %s\n", __func__ , irlan_state[state]);
IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
...@@ -50,7 +50,7 @@ void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state) ...@@ -50,7 +50,7 @@ void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
void irlan_next_provider_state(struct irlan_cb *self, IRLAN_STATE state) void irlan_next_provider_state(struct irlan_cb *self, IRLAN_STATE state)
{ {
IRDA_DEBUG(2, "%s(), %s\n", __func__ , irlan_state[state]); pr_debug("%s(), %s\n", __func__ , irlan_state[state]);
IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment