Merge tag 'for-3.4' of git://openrisc.net/jonas/linux

[firefly-linux-kernel-4.4.55.git] / drivers / isdn / sc / timer.c

diff --git a/drivers/isdn/sc/timer.c b/drivers/isdn/sc/timer.c
index 91fbe0dc28ec75a655b68b31fbe69c8241c3563b..6fbac2230d7e7344d7d50b37ceb32c220cdbd41b 100644 (file)
--- a/drivers/isdn/sc/timer.c
+++ b/drivers/isdn/sc/timer.c
@@ -31,7 +31,7 @@ static void setup_ports(int card)
 
        /* And the IRQ */
        outb((sc_adapter[card]->interrupt | 0x80),
-               sc_adapter[card]->ioport[IRQ_SELECT]);
+            sc_adapter[card]->ioport[IRQ_SELECT]);
 }
 
 /*
@@ -50,18 +50,18 @@ void sc_check_reset(unsigned long data)
        int card = (unsigned int) data;
 
        pr_debug("%s: check_timer timer called\n",
-               sc_adapter[card]->devicename);
+                sc_adapter[card]->devicename);
 
        /* Setup the io ports */
        setup_ports(card);
 
        spin_lock_irqsave(&sc_adapter[card]->lock, flags);
        outb(sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport],
-               (sc_adapter[card]->shmem_magic>>14) | 0x80);
+            (sc_adapter[card]->shmem_magic >> 14) | 0x80);
        sig = (unsigned long) *((unsigned long *)(sc_adapter[card]->rambase + SIG_OFFSET));
 
        /* check the signature */
-       if(sig == SIGNATURE) {
+       if (sig == SIGNATURE) {
                flushreadfifo(card);
                spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);
                /* See if we need to do a startproc */
@@ -69,8 +69,8 @@ void sc_check_reset(unsigned long data)
                        startproc(card);
        } else  {
                pr_debug("%s: No signature yet, waiting another %lu jiffies.\n",
-                       sc_adapter[card]->devicename, CHECKRESET_TIME);
-               mod_timer(&sc_adapter[card]->reset_timer, jiffies+CHECKRESET_TIME);
+                        sc_adapter[card]->devicename, CHECKRESET_TIME);
+               mod_timer(&sc_adapter[card]->reset_timer, jiffies + CHECKRESET_TIME);
                spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);
        }
 }
@@ -91,19 +91,19 @@ void check_phystat(unsigned long data)
        int card = (unsigned int) data;
 
        pr_debug("%s: Checking status...\n", sc_adapter[card]->devicename);
-       /* 
+       /*
         * check the results of the last PhyStat and change only if
         * has changed drastically
         */
        if (sc_adapter[card]->nphystat && !sc_adapter[card]->phystat) {   /* All is well */
                pr_debug("PhyStat transition to RUN\n");
-               pr_info("%s: Switch contacted, transmitter enabled\n", 
+               pr_info("%s: Switch contacted, transmitter enabled\n",
                        sc_adapter[card]->devicename);
                indicate_status(card, ISDN_STAT_RUN, 0, NULL);
        }
        else if (!sc_adapter[card]->nphystat && sc_adapter[card]->phystat) {   /* All is not well */
                pr_debug("PhyStat transition to STOP\n");
-               pr_info("%s: Switch connection lost, transmitter disabled\n", 
+               pr_info("%s: Switch connection lost, transmitter disabled\n",
                        sc_adapter[card]->devicename);
 
                indicate_status(card, ISDN_STAT_STOP, 0, NULL);
@@ -113,11 +113,10 @@ void check_phystat(unsigned long data)
 
        /* Reinitialize the timer */
        spin_lock_irqsave(&sc_adapter[card]->lock, flags);
-       mod_timer(&sc_adapter[card]->stat_timer, jiffies+CHECKSTAT_TIME);
+       mod_timer(&sc_adapter[card]->stat_timer, jiffies + CHECKSTAT_TIME);
        spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);
 
        /* Send a new cePhyStatus message */
-       sendmessage(card, CEPID,ceReqTypePhy,ceReqClass2,
-               ceReqPhyStatus,0,0,NULL);
+       sendmessage(card, CEPID, ceReqTypePhy, ceReqClass2,
+                   ceReqPhyStatus, 0, 0, NULL);
 }
-