]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
[ATM]: speedtch: Revert 86cf42e4e029b83110cf98692420239103363dbf
authorDavid S. Miller <davem@davemloft.net>
Tue, 26 Jul 2005 02:54:35 +0000 (19:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Jul 2005 02:54:35 +0000 (19:54 -0700)
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>
drivers/usb/atm/speedtch.c

index 6bd581e69afde63bbd9b5bf8bedf1699e4987529..d0cbbb7f0385df42d3152646b51cfbedf1667d3f 100644 (file)
@@ -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)
                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;
                        /* 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;
                        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:
                        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
        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)
 }
 
 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);
 
        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)) {
        } 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;
 
        } else {
                int i;