s390/raw3270: fix indentation/whitespace errors

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 3b6735e..1c21add 100644 (file)
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -142,7 +142,7 @@ struct raw3270_request *raw3270_request_alloc(size_t size)
        struct raw3270_request *rq;
 
        /* Allocate request structure */
-       rq = kzalloc(sizeof(struct raw3270_request), GFP_KERNEL | GFP_DMA);
+       rq = kzalloc(sizeof(*rq), GFP_KERNEL | GFP_DMA);
        if (!rq)
                return ERR_PTR(-ENOMEM);
 
@@ -248,7 +248,7 @@ static int __raw3270_start(struct raw3270 *rp, struct raw3270_view *view,
            !test_bit(RAW3270_FLAGS_BUSY, &rp->flags)) {
                /* No other requests are on the queue. Start this one. */
                rq->rc = ccw_device_start(rp->cdev, &rq->ccw,
-                                              (unsigned long) rq, 0, 0);
+                                         (unsigned long)rq, 0, 0);
                if (rq->rc) {
                        raw3270_put_view(view);
                        return rq->rc;
@@ -338,7 +338,7 @@ static void raw3270_irq(struct ccw_device *cdev, unsigned long intparm, struct i
        rp = dev_get_drvdata(&cdev->dev);
        if (!rp)
                return;
-       rq = (struct raw3270_request *) intparm;
+       rq = (struct raw3270_request *)intparm;
        view = rq ? rq->view : rp->view;
 
        if (!IS_ERR(irb)) {
@@ -379,9 +379,9 @@ static void raw3270_irq(struct ccw_device *cdev, unsigned long intparm, struct i
         * started successful.
         */
        while (!list_empty(&rp->req_queue)) {
-               rq = list_entry(rp->req_queue.next,struct raw3270_request,list);
+               rq = list_entry(rp->req_queue.next, struct raw3270_request, list);
                rq->rc = ccw_device_start(rp->cdev, &rq->ccw,
-                                         (unsigned long) rq, 0, 0);
+                                         (unsigned long)rq, 0, 0);
                if (rq->rc == 0)
                        break;
                /* Start failed. Remove request and do callback. */
@@ -557,6 +557,7 @@ static void raw3270_size_device_done(struct raw3270 *rp)
 void raw3270_read_modified_cb(struct raw3270_request *rq, void *data)
 {
        struct raw3270 *rp = rq->view->dev;
+
        raw3270_size_device(rp, data);
        raw3270_size_device_done(rp);
 }
@@ -572,7 +573,7 @@ static void raw3270_read_modified(struct raw3270 *rp)
        rp->init_readmod.ccw.cmd_code = TC_READMOD;
        rp->init_readmod.ccw.flags = CCW_FLAG_SLI;
        rp->init_readmod.ccw.count = sizeof(rp->init_data);
-       rp->init_readmod.ccw.cda = (__u32) __pa(rp->init_data);
+       rp->init_readmod.ccw.cda = (__u32)__pa(rp->init_data);
        rp->init_readmod.callback = raw3270_read_modified_cb;
        rp->init_readmod.callback_data = rp->init_data;
        rp->state = RAW3270_STATE_READMOD;
@@ -581,8 +582,9 @@ static void raw3270_read_modified(struct raw3270 *rp)
 
 static void raw3270_writesf_readpart(struct raw3270 *rp)
 {
-       static const unsigned char wbuf[] =
-               { 0x00, 0x07, 0x01, 0xff, 0x03, 0x00, 0x81 };
+       static const unsigned char wbuf[] = {
+               0x00, 0x07, 0x01, 0xff, 0x03, 0x00, 0x81
+       };
 
        /* Store 'read partition' data stream to init_data */
        memset(&rp->init_readpart, 0, sizeof(rp->init_readpart));
@@ -591,7 +593,7 @@ static void raw3270_writesf_readpart(struct raw3270 *rp)
        rp->init_readpart.ccw.cmd_code = TC_WRITESF;
        rp->init_readpart.ccw.flags = CCW_FLAG_SLI;
        rp->init_readpart.ccw.count = sizeof(wbuf);
-       rp->init_readpart.ccw.cda = (__u32) __pa(&rp->init_data);
+       rp->init_readpart.ccw.cda = (__u32)__pa(&rp->init_data);
        rp->state = RAW3270_STATE_W4ATTN;
        raw3270_start_irq(&rp->init_view, &rp->init_readpart);
 }
@@ -611,8 +613,9 @@ static void raw3270_reset_device_cb(struct raw3270_request *rq, void *data)
        } else if (MACHINE_IS_VM) {
                raw3270_size_device_vm(rp);
                raw3270_size_device_done(rp);
-       } else
+       } else {
                raw3270_writesf_readpart(rp);
+       }
        memset(&rp->init_reset, 0, sizeof(rp->init_reset));
 }
 
@@ -628,7 +631,7 @@ static int __raw3270_reset_device(struct raw3270 *rp)
        rp->init_reset.ccw.cmd_code = TC_EWRITEA;
        rp->init_reset.ccw.flags = CCW_FLAG_SLI;
        rp->init_reset.ccw.count = 1;
-       rp->init_reset.ccw.cda = (__u32) __pa(rp->init_data);
+       rp->init_reset.ccw.cda = (__u32)__pa(rp->init_data);
        rp->init_reset.callback = raw3270_reset_device_cb;
        rc = __raw3270_start(rp, &rp->init_view, &rp->init_reset);
        if (rc == 0 && rp->state == RAW3270_STATE_INIT)
@@ -672,7 +675,7 @@ static void __raw3270_disconnect(struct raw3270 *rp)
        rp->view = &rp->init_view;
        /* Cancel all queued requests */
        while (!list_empty(&rp->req_queue)) {
-               rq = list_entry(rp->req_queue.next,struct raw3270_request,list);
+               rq = list_entry(rp->req_queue.next, struct raw3270_request, list);
                view = rq->view;
                rq->rc = -EACCES;
                list_del_init(&rq->list);
@@ -800,7 +803,7 @@ struct raw3270 __init *raw3270_setup_console(void)
        if (IS_ERR(cdev))
                return ERR_CAST(cdev);
 
-       rp = kzalloc(sizeof(struct raw3270), GFP_KERNEL | GFP_DMA);
+       rp = kzalloc(sizeof(*rp), GFP_KERNEL | GFP_DMA);
        ascebc = kzalloc(256, GFP_KERNEL);
        rc = raw3270_setup_device(cdev, rp, ascebc);
        if (rc)
@@ -845,7 +848,7 @@ static struct raw3270 *raw3270_create_device(struct ccw_device *cdev)
        char *ascebc;
        int rc;
 
-       rp = kzalloc(sizeof(struct raw3270), GFP_KERNEL | GFP_DMA);
+       rp = kzalloc(sizeof(*rp), GFP_KERNEL | GFP_DMA);
        if (!rp)
                return ERR_PTR(-ENOMEM);
        ascebc = kmalloc(256, GFP_KERNEL);
@@ -893,11 +896,11 @@ int raw3270_activate_view(struct raw3270_view *view)
        if (!rp)
                return -ENODEV;
        spin_lock_irqsave(get_ccwdev_lock(rp->cdev), flags);
-       if (rp->view == view)
+       if (rp->view == view) {
                rc = 0;
-       else if (!raw3270_state_ready(rp))
+       } else if (!raw3270_state_ready(rp)) {
                rc = -EBUSY;
-       else {
+       } else {
                oldview = NULL;
                if (rp->view && rp->view->fn->deactivate) {
                        oldview = rp->view;
@@ -1117,7 +1120,7 @@ raw3270_columns_show(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR(columns, 0444, raw3270_columns_show, NULL);
 
-static struct attribute * raw3270_attrs[] = {
+static struct attribute *raw3270_attrs[] = {
        &dev_attr_model.attr,
        &dev_attr_rows.attr,
        &dev_attr_columns.attr,

diff --git a/drivers/s390/char/raw3270.h b/drivers/s390/char/raw3270.h
index 19f2bc1..c64eac3 100644 (file)
--- a/drivers/s390/char/raw3270.h
+++ b/drivers/s390/char/raw3270.h
@@ -16,8 +16,8 @@
 #define TUBOCMD                _IO('3', 4)     /* set ccw command for fs writes. */
 #define TUBGETI                _IO('3', 7)     /* get ccw command for fs reads. */
 #define TUBGETO                _IO('3', 8)     /* get ccw command for fs writes. */
-#define TUBSETMOD      _IO('3',12)     /* FIXME: what does it do ?*/
-#define TUBGETMOD      _IO('3',13)     /* FIXME: what does it do ?*/
+#define TUBSETMOD      _IO('3', 12)    /* FIXME: what does it do ?*/
+#define TUBGETMOD      _IO('3', 13)    /* FIXME: what does it do ?*/
 
 /* Local Channel Commands */
 #define TC_WRITE       0x01            /* Write */