summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-07-25 19:54:35 -0700
committerDavid S. Miller <davem@davemloft.net>2005-07-25 19:54:35 -0700
commit52fbae2a392b6e084195bedc7a280991a94c14d0 (patch)
tree10778d2286e381980fd7d7898a654aea13b377c4 /drivers/usb
parentfc87670b6cd63abc6fc4e3a115741984750d1fbc (diff)
downloadop-kernel-dev-52fbae2a392b6e084195bedc7a280991a94c14d0.zip
op-kernel-dev-52fbae2a392b6e084195bedc7a280991a94c14d0.tar.gz
[ATM]: speedtch: Revert 86cf42e4e029b83110cf98692420239103363dbf
It was already fixed more sufficiently by Andrew Morton's change 843c944fb86e5e31ee7b319172e657ea22301322. Noted by Duncan Sands. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/atm/speedtch.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index 6bd581e..d0cbbb7 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -448,19 +448,19 @@ static void speedtch_check_status(struct speedtch_instance_data *instance)
case 0:
atm_dev->signal = ATM_PHY_SIG_LOST;
if (instance->last_status)
- atm_info(usbatm, "%s\n", "ADSL line is down");
+ atm_info(usbatm, "ADSL line is down\n");
/* It may never resync again unless we ask it to... */
ret = speedtch_start_synchro(instance);
break;
case 0x08:
atm_dev->signal = ATM_PHY_SIG_UNKNOWN;
- atm_info(usbatm, "%s\n", "ADSL line is blocked?");
+ atm_info(usbatm, "ADSL line is blocked?\n");
break;
case 0x10:
atm_dev->signal = ATM_PHY_SIG_LOST;
- atm_info(usbatm, "%s\n", "ADSL line is synchronising");
+ atm_info(usbatm, "ADSL line is synchronising\n");
break;
case 0x20:
@@ -502,7 +502,7 @@ static void speedtch_status_poll(unsigned long data)
if (instance->poll_delay < MAX_POLL_DELAY)
mod_timer(&instance->status_checker.timer, jiffies + msecs_to_jiffies(instance->poll_delay));
else
- atm_warn(instance->usbatm, "%s\n", "Too many failures - disabling line status polling");
+ atm_warn(instance->usbatm, "Too many failures - disabling line status polling\n");
}
static void speedtch_resubmit_int(unsigned long data)
@@ -545,9 +545,9 @@ static void speedtch_handle_int(struct urb *int_urb, struct pt_regs *regs)
if ((count == 6) && !memcmp(up_int, instance->int_data, 6)) {
del_timer(&instance->status_checker.timer);
- atm_info(usbatm, "%s\n", "DSL line goes up");
+ atm_info(usbatm, "DSL line goes up\n");
} else if ((count == 6) && !memcmp(down_int, instance->int_data, 6)) {
- atm_info(usbatm, "%s\n", "DSL line goes down");
+ atm_info(usbatm, "DSL line goes down\n");
} else {
int i;
OpenPOWER on IntegriCloud