Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc...

[~andy/linux] / drivers / isdn / gigaset / bas-gigaset.c

diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 3913f47ef86dc08b85ff8d3526cda0b1a56b0ed7..afa080258bfa54be0bb48b0f51a5abce8df7afd5 100644 (file)
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -410,10 +410,10 @@ static void check_pending(struct bas_cardstate *ucs)
                if (!(ucs->basstate & BS_RESETTING))
                        ucs->pending = 0;
                break;
-       /*
-        * HD_READ_ATMESSAGE and HD_WRITE_ATMESSAGE are handled separately
-        * and should never end up here
-        */
+               /*
+                * HD_READ_ATMESSAGE and HD_WRITE_ATMESSAGE are handled separately
+                * and should never end up here
+                */
        default:
                dev_warn(&ucs->interface->dev,
                         "unknown pending request 0x%02x cleared\n",
@@ -491,7 +491,7 @@ static void read_ctrl_callback(struct urb *urb)
                numbytes = urb->actual_length;
                if (unlikely(numbytes != ucs->rcvbuf_size)) {
                        dev_warn(cs->dev,
-                              "control read: received %d chars, expected %d\n",
+                                "control read: received %d chars, expected %d\n",
                                 numbytes, ucs->rcvbuf_size);
                        if (numbytes > ucs->rcvbuf_size)
                                numbytes = ucs->rcvbuf_size;
@@ -710,7 +710,7 @@ static void read_int_callback(struct urb *urb)
        }
 
        l = (unsigned) ucs->int_in_buf[1] +
-           (((unsigned) ucs->int_in_buf[2]) << 8);
+               (((unsigned) ucs->int_in_buf[2]) << 8);
 
        gig_dbg(DEBUG_USBREQ, "<-------%d: 0x%02x (%u [0x%02x 0x%02x])",
                urb->actual_length, (int)ucs->int_in_buf[0], l,
@@ -770,14 +770,14 @@ static void read_int_callback(struct urb *urb)
        case HD_RECEIVEATDATA_ACK:      /* AT response ready to be received */
                if (!l) {
                        dev_warn(cs->dev,
-                               "HD_RECEIVEATDATA_ACK with length 0 ignored\n");
+                                "HD_RECEIVEATDATA_ACK with length 0 ignored\n");
                        break;
                }
                spin_lock_irqsave(&cs->lock, flags);
                if (ucs->basstate & BS_ATRDPEND) {
                        spin_unlock_irqrestore(&cs->lock, flags);
                        dev_warn(cs->dev,
-       "HD_RECEIVEATDATA_ACK(%d) during HD_READ_ATMESSAGE(%d) ignored\n",
+                                "HD_RECEIVEATDATA_ACK(%d) during HD_READ_ATMESSAGE(%d) ignored\n",
                                 l, ucs->rcvbuf_size);
                        break;
                }
@@ -878,7 +878,7 @@ static void read_iso_callback(struct urb *urb)
                        ubc->isoinlost += urb->iso_frame_desc[i].actual_length;
                        if (unlikely(urb->iso_frame_desc[i].status != 0 &&
                                     urb->iso_frame_desc[i].status !=
-                                                               -EINPROGRESS))
+                                    -EINPROGRESS))
                                ubc->loststatus = urb->iso_frame_desc[i].status;
                        urb->iso_frame_desc[i].status = 0;
                        urb->iso_frame_desc[i].actual_length = 0;
@@ -891,7 +891,7 @@ static void read_iso_callback(struct urb *urb)
                        rc = usb_submit_urb(urb, GFP_ATOMIC);
                        if (unlikely(rc != 0 && rc != -ENODEV)) {
                                dev_err(bcs->cs->dev,
-                                      "could not resubmit isoc read URB: %s\n",
+                                       "could not resubmit isoc read URB: %s\n",
                                        get_usb_rcmsg(rc));
                                dump_urb(DEBUG_ISO, "isoc read", urb);
                                error_hangup(bcs);
@@ -1017,17 +1017,17 @@ static int starturbs(struct bc_state *bcs)
        }
 
        /* keep one URB free, submit the others */
-       for (k = 0; k < BAS_OUTURBS-1; ++k) {
+       for (k = 0; k < BAS_OUTURBS - 1; ++k) {
                dump_urb(DEBUG_ISO, "Initial isoc write", urb);
                rc = usb_submit_urb(ubc->isoouturbs[k].urb, GFP_ATOMIC);
                if (rc != 0)
                        goto error;
        }
        dump_urb(DEBUG_ISO, "Initial isoc write (free)", urb);
-       ubc->isooutfree = &ubc->isoouturbs[BAS_OUTURBS-1];
+       ubc->isooutfree = &ubc->isoouturbs[BAS_OUTURBS - 1];
        ubc->isooutdone = ubc->isooutovfl = NULL;
        return 0;
- error:
+error:
        stopurbs(ubc);
        return rc;
 }
@@ -1229,7 +1229,7 @@ static void write_iso_tasklet(unsigned long data)
                                if (ifd->status ||
                                    ifd->actual_length != ifd->length) {
                                        dev_warn(cs->dev,
-                                           "isoc write: frame %d[%d/%d]: %s\n",
+                                                "isoc write: frame %d[%d/%d]: %s\n",
                                                 i, ifd->actual_length,
                                                 ifd->length,
                                                 get_usb_statmsg(ifd->status));
@@ -1316,7 +1316,7 @@ static void read_iso_tasklet(unsigned long data)
                ubc->isoindone = NULL;
                if (unlikely(ubc->loststatus != -EINPROGRESS)) {
                        dev_warn(cs->dev,
-               "isoc read overrun, URB dropped (status: %s, %d bytes)\n",
+                                "isoc read overrun, URB dropped (status: %s, %d bytes)\n",
                                 get_usb_statmsg(ubc->loststatus),
                                 ubc->isoinlost);
                        ubc->loststatus = -EINPROGRESS;
@@ -1965,7 +1965,7 @@ static int gigaset_write_cmd(struct cardstate *cs, struct cmdbuf_t *cb)
        int rc;
 
        gigaset_dbg_buffer(cs->mstate != MS_LOCKED ?
-                            DEBUG_TRANSCMD : DEBUG_LOCKCMD,
+                          DEBUG_TRANSCMD : DEBUG_LOCKCMD,
                           "CMD Transmit", cb->len, cb->buf);
 
        /* translate "+++" escape sequence sent as a single separate command
@@ -2453,13 +2453,13 @@ static int gigaset_suspend(struct usb_interface *intf, pm_message_t message)
 
        /* wait a bit for blocking conditions to go away */
        rc = wait_event_timeout(ucs->waitqueue,
-                       !(ucs->basstate &
-                         (BS_B1OPEN|BS_B2OPEN|BS_ATRDPEND|BS_ATWRPEND)),
-                       BAS_TIMEOUT*HZ/10);
+                               !(ucs->basstate &
+                                 (BS_B1OPEN | BS_B2OPEN | BS_ATRDPEND | BS_ATWRPEND)),
+                               BAS_TIMEOUT * HZ / 10);
        gig_dbg(DEBUG_SUSPEND, "wait_event_timeout() -> %d", rc);
 
        /* check for conditions preventing suspend */
-       if (ucs->basstate & (BS_B1OPEN|BS_B2OPEN|BS_ATRDPEND|BS_ATWRPEND)) {
+       if (ucs->basstate & (BS_B1OPEN | BS_B2OPEN | BS_ATRDPEND | BS_ATWRPEND)) {
                dev_warn(cs->dev, "cannot suspend:\n");
                if (ucs->basstate & BS_B1OPEN)
                        dev_warn(cs->dev, " B channel 1 open\n");
@@ -2482,7 +2482,7 @@ static int gigaset_suspend(struct usb_interface *intf, pm_message_t message)
                        return rc;
                }
                wait_event_timeout(ucs->waitqueue, !ucs->pending,
-                                  BAS_TIMEOUT*HZ/10);
+                                  BAS_TIMEOUT * HZ / 10);
                /* in case of timeout, proceed anyway */
        }