ide: remove try_to_identify() wrapper

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index c63c0780758344680e10ab0c397c6e41470a2992..5e0c3fb3b43a70ded4d5f4575c380569f635353c 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -250,7 +250,7 @@ err_misc:
 }
 
 /**
- *     actual_try_to_identify  -       send ata/atapi identify
+ *     try_to_identify -       send ATA/ATAPI identify
  *     @drive: drive to identify
  *     @cmd: command to use
  *
@@ -262,7 +262,7 @@ err_misc:
  *                     2  device aborted the command (refused to identify itself)
  */
 
-static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
+static int try_to_identify(ide_drive_t *drive, u8 cmd)
 {
        ide_hwif_t *hwif = drive->hwif;
        struct ide_io_ports *io_ports = &hwif->io_ports;
@@ -271,6 +271,13 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
        unsigned long timeout;
        u8 s = 0, a = 0;
 
+       /*
+        * Disable device IRQ.  Otherwise we'll get spurious interrupts
+        * during the identify phase that the IRQ handler isn't expecting.
+        */
+       if (io_ports->ctl_addr)
+               tp_ops->set_irq(hwif, 0);
+
        /* take a deep breath */
        msleep(50);
 
@@ -327,29 +334,6 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
        return rc;
 }
 
-/**
- *     try_to_identify -       try to identify a drive
- *     @drive: drive to probe
- *     @cmd: command to use
- *
- *     Issue the identify command.
- */
- 
-static int try_to_identify (ide_drive_t *drive, u8 cmd)
-{
-       ide_hwif_t *hwif = drive->hwif;
-       const struct ide_tp_ops *tp_ops = hwif->tp_ops;
-
-       /*
-        * Disable device IRQ.  Otherwise we'll get spurious interrupts
-        * during the identify phase that the IRQ handler isn't expecting.
-        */
-       if (hwif->io_ports.ctl_addr)
-               tp_ops->set_irq(hwif, 0);
-
-       return actual_try_to_identify(drive, cmd);
-}
-
 int ide_busy_sleep(ide_hwif_t *hwif, unsigned long timeout, int altstatus)
 {
        u8 stat;