1 files changed, 18 insertions, 36 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index cfb1fff3787c..7e9978ad1445 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -95,7 +95,7 @@ dasd_alloc_device(void)
         spin_lock_init(&device->mem_lock);
         spin_lock_init(&device->request_queue_lock);
         atomic_set (&device->tasklet_scheduled, 0);
-        tasklet_init(&device->tasklet, 
+        tasklet_init(&device->tasklet,
                      (void (*)(unsigned long)) dasd_tasklet,
                      (unsigned long) device);
         INIT_LIST_HEAD(&device->ccw_queue);
@@ -128,7 +128,7 @@ dasd_state_new_to_known(struct dasd_device *device)
         int rc;
 
         /*
-         * As long as the device is not in state DASD_STATE_NEW we want to 
+         * As long as the device is not in state DASD_STATE_NEW we want to
          * keep the reference count > 0.
          */
         dasd_get_device(device);
@@ -336,7 +336,7 @@ dasd_decrease_state(struct dasd_device *device)
         if (device->state == DASD_STATE_ONLINE &&
             device->target <= DASD_STATE_READY)
                 dasd_state_online_to_ready(device);
-        
+
         if (device->state == DASD_STATE_READY &&
             device->target <= DASD_STATE_BASIC)
                 dasd_state_ready_to_basic(device);
@@ -348,7 +348,7 @@ dasd_decrease_state(struct dasd_device *device)
         if (device->state == DASD_STATE_BASIC &&
             device->target <= DASD_STATE_KNOWN)
                 dasd_state_basic_to_known(device);
-        
+
         if (device->state == DASD_STATE_KNOWN &&
             device->target <= DASD_STATE_NEW)
                 dasd_state_known_to_new(device);
@@ -994,7 +994,7 @@ dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
                       ((irb->scsw.cstat << 8) | irb->scsw.dstat), cqr);
 
         /* Find out the appropriate era_action. */
-        if (irb->scsw.fctl & SCSW_FCTL_HALT_FUNC) 
+        if (irb->scsw.fctl & SCSW_FCTL_HALT_FUNC)
                 era = dasd_era_fatal;
         else if (irb->scsw.dstat == (DEV_STAT_CHN_END | DEV_STAT_DEV_END) &&
                  irb->scsw.cstat == 0 &&
@@ -1004,7 +1004,7 @@ dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
                 era = dasd_era_fatal; /* don't recover this request */
         else if (irb->esw.esw0.erw.cons)
                 era = device->discipline->examine_error(cqr, irb);
-        else 
+        else
                 era = dasd_era_recover;
 
         DBF_DEV_EVENT(DBF_DEBUG, device, "era_code %d", era);
@@ -1287,7 +1287,7 @@ __dasd_start_head(struct dasd_device * device)
 }
 
 /*
- * Remove requests from the ccw queue. 
+ * Remove requests from the ccw queue.
  */
 static void
 dasd_flush_ccw_queue(struct dasd_device * device, int all)
@@ -1450,23 +1450,23 @@ dasd_sleep_on(struct dasd_ccw_req * cqr)
         wait_queue_head_t wait_q;
         struct dasd_device *device;
         int rc;
-        
+
         device = cqr->device;
         spin_lock_irq(get_ccwdev_lock(device->cdev));
-        
+
         init_waitqueue_head (&wait_q);
         cqr->callback = dasd_wakeup_cb;
         cqr->callback_data = (void *) &wait_q;
         cqr->status = DASD_CQR_QUEUED;
         list_add_tail(&cqr->list, &device->ccw_queue);
-        
+
         /* let the bh start the request to keep them in order */
         dasd_schedule_bh(device);
-        
+
         spin_unlock_irq(get_ccwdev_lock(device->cdev));
 
         wait_event(wait_q, _wait_for_wakeup(cqr));
-        
+
         /* Request status is either done or failed. */
         rc = (cqr->status == DASD_CQR_FAILED) ? -EIO : 0;
         return rc;
@@ -1568,7 +1568,7 @@ dasd_sleep_on_immediatly(struct dasd_ccw_req * cqr)
         wait_queue_head_t wait_q;
         struct dasd_device *device;
         int rc;
-        
+
         device = cqr->device;
         spin_lock_irq(get_ccwdev_lock(device->cdev));
         rc = _dasd_term_running_cqr(device);
@@ -1576,20 +1576,20 @@ dasd_sleep_on_immediatly(struct dasd_ccw_req * cqr)
                 spin_unlock_irq(get_ccwdev_lock(device->cdev));
                 return rc;
         }
-        
+
         init_waitqueue_head (&wait_q);
         cqr->callback = dasd_wakeup_cb;
         cqr->callback_data = (void *) &wait_q;
         cqr->status = DASD_CQR_QUEUED;
         list_add(&cqr->list, &device->ccw_queue);
-        
+
         /* let the bh start the request to keep them in order */
         dasd_schedule_bh(device);
-        
+
         spin_unlock_irq(get_ccwdev_lock(device->cdev));
 
         wait_event(wait_q, _wait_for_wakeup(cqr));
-        
+
         /* Request status is either done or failed. */
         rc = (cqr->status == DASD_CQR_FAILED) ? -EIO : 0;
         return rc;
@@ -1725,7 +1725,7 @@ dasd_flush_request_queue(struct dasd_device * device)
 
         if (!device->request_queue)
                 return;
-        
+
         spin_lock_irq(&device->request_queue_lock);
         while (!list_empty(&device->request_queue->queue_head)) {
                 req = elv_next_request(device->request_queue);
@@ -2172,21 +2172,3 @@ EXPORT_SYMBOL_GPL(dasd_generic_set_online);
 EXPORT_SYMBOL_GPL(dasd_generic_set_offline);
 EXPORT_SYMBOL_GPL(dasd_generic_auto_online);
 
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-indent-level: 4
- * c-brace-imaginary-offset: 0
- * c-brace-offset: -4
- * c-argdecl-indent: 4
- * c-label-offset: -4
- * c-continued-statement-offset: 4
- * c-continued-brace-offset: 0
- * indent-tabs-mode: 1
- * tab-width: 8
- * End:
- */