ide: remove IDE_ARCH_LOCK (v2)

* Add ->{get,release}_lock methods to struct ide_port_info
  and struct ide_host.

* Convert core IDE code, m68k IDE code and falconide support to use
  ->{get,release}_lock methods instead of ide_{get,release}_lock().

* Remove IDE_ARCH_LOCK.

v2:
* Build fix from Geert updating ide_{get,release}_lock() callers in
  falconide.c.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index e85060164203..030b0ea1a1e1 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -501,8 +501,8 @@ static inline int ide_lock_host(struct ide_host *host, ide_hwif_t *hwif)
         if (host->host_flags & IDE_HFLAG_SERIALIZE) {
                 rc = test_and_set_bit_lock(IDE_HOST_BUSY, &host->host_busy);
                 if (rc == 0) {
-                        /* for atari only */
-                        ide_get_lock(ide_intr, hwif);
+                        if (host->get_lock)
+                                host->get_lock(ide_intr, hwif);
                 }
         }
         return rc;
@@ -511,8 +511,8 @@ static inline int ide_lock_host(struct ide_host *host, ide_hwif_t *hwif)
 static inline void ide_unlock_host(struct ide_host *host)
 {
         if (host->host_flags & IDE_HFLAG_SERIALIZE) {
-                /* for atari only */
-                ide_release_lock();
+                if (host->release_lock)
+                        host->release_lock();
                 clear_bit_unlock(IDE_HOST_BUSY, &host->host_busy);
         }
 }