ide: replace the global ide_lock spinlock by per-hwgroup spinlocks (v2)

Now that (almost) all host drivers have been fixed not to abuse ide_lock
and core code usage of ide_lock has been sanitized we may safely replace
ide_lock by per-hwgroup locks.

This patch is partially based on earlier patch from Ravikiran G Thirumalai.

While at it:
- don't use deprecated HWIF() and HWGROUP() macros
- update locking documentation in ide.h

v2:
Add missing spin_lock_init(&hwgroup->lock).  (Noticed by Elias Oltmanns)

Cc: Vaibhav V. Nivargi <vaibhav.nivargi@gmail.com>
Cc: Alok N. Kataria <alokk@calsoftinc.com>
Cc: Shai Fultheim <shai@scalex86.org>
Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Cc: Elias Oltmanns <eo@nebensachen.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c
index 03b00e57e93f..63d01c55f865 100644
--- a/drivers/ide/ide-park.c
+++ b/drivers/ide/ide-park.c
@@ -7,17 +7,16 @@ DECLARE_WAIT_QUEUE_HEAD(ide_park_wq);
 
 static void issue_park_cmd(ide_drive_t *drive, unsigned long timeout)
 {
+        ide_hwgroup_t *hwgroup = drive->hwif->hwgroup;
         struct request_queue *q = drive->queue;
         struct request *rq;
         int rc;
 
         timeout += jiffies;
-        spin_lock_irq(&ide_lock);
+        spin_lock_irq(&hwgroup->lock);
         if (drive->dev_flags & IDE_DFLAG_PARKED) {
-                ide_hwgroup_t *hwgroup = drive->hwif->hwgroup;
-                int reset_timer;
+                int reset_timer = time_before(timeout, drive->sleep);
 
-                reset_timer = time_before(timeout, drive->sleep);
                 drive->sleep = timeout;
                 wake_up_all(&ide_park_wq);
                 if (reset_timer && hwgroup->sleeping &&
@@ -26,10 +25,10 @@ static void issue_park_cmd(ide_drive_t *drive, unsigned long timeout)
                         hwgroup->busy = 0;
                         blk_start_queueing(q);
                 }
-                spin_unlock_irq(&ide_lock);
+                spin_unlock_irq(&hwgroup->lock);
                 return;
         }
-        spin_unlock_irq(&ide_lock);
+        spin_unlock_irq(&hwgroup->lock);
 
         rq = blk_get_request(q, READ, __GFP_WAIT);
         rq->cmd[0] = REQ_PARK_HEADS;
@@ -62,20 +61,21 @@ ssize_t ide_park_show(struct device *dev, struct device_attribute *attr,
                       char *buf)
 {
         ide_drive_t *drive = to_ide_device(dev);
+        ide_hwgroup_t *hwgroup = drive->hwif->hwgroup;
         unsigned long now;
         unsigned int msecs;
 
         if (drive->dev_flags & IDE_DFLAG_NO_UNLOAD)
                 return -EOPNOTSUPP;
 
-        spin_lock_irq(&ide_lock);
+        spin_lock_irq(&hwgroup->lock);
         now = jiffies;
         if (drive->dev_flags & IDE_DFLAG_PARKED &&
             time_after(drive->sleep, now))
                 msecs = jiffies_to_msecs(drive->sleep - now);
         else
                 msecs = 0;
-        spin_unlock_irq(&ide_lock);
+        spin_unlock_irq(&hwgroup->lock);
 
         return snprintf(buf, 20, "%u\n", msecs);
 }