ide: add ide_check_atapi_device() helper

* Add ide_check_atapi_device() to ide-atapi.c and convert
  ide-{floppy,tape}.c to use it instead of ide*_identify_device().

While at it:

* Add DRV_NAME defines to ide-{floppy,tape}.c.

Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 3 insertions, 40 deletions

diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 1fc1c2a6888f..7f56f2003342 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -15,6 +15,8 @@
  * Documentation/ide/ChangeLog.ide-tape.1995-2002
  */
 
+#define DRV_NAME "ide-tape"
+
 #define IDETAPE_VERSION "1.20"
 
 #include <linux/module.h>
@@ -2296,45 +2298,6 @@ static int idetape_chrdev_release(struct inode *inode, struct file *filp)
         return 0;
 }
 
-/*
- * check the contents of the ATAPI IDENTIFY command results. We return:
- *
- * 1 - If the tape can be supported by us, based on the information we have so
- * far.
- *
- * 0 - If this tape driver is not currently supported by us.
- */
-static int idetape_identify_device(ide_drive_t *drive)
-{
-        u8 gcw[2], protocol, device_type, removable, packet_size;
-
-        if (drive->id_read == 0)
-                return 1;
-
-        *((u16 *)&gcw) = drive->id[ATA_ID_CONFIG];
-
-        protocol        =   (gcw[1] & 0xC0) >> 6;
-        device_type     =    gcw[1] & 0x1F;
-        removable       = !!(gcw[0] & 0x80);
-        packet_size     =    gcw[0] & 0x3;
-
-        /* Check that we can support this device */
-        if (protocol != 2)
-                printk(KERN_ERR "ide-tape: Protocol (0x%02x) is not ATAPI\n",
-                                protocol);
-        else if (device_type != 1)
-                printk(KERN_ERR "ide-tape: Device type (0x%02x) is not set "
-                                "to tape\n", device_type);
-        else if (!removable)
-                printk(KERN_ERR "ide-tape: The removable flag is not set\n");
-        else if (packet_size != 0) {
-                printk(KERN_ERR "ide-tape: Packet size (0x%02x) is not 12"
-                                " bytes\n", packet_size);
-        } else
-                return 1;
-        return 0;
-}
-
 static void idetape_get_inquiry_results(ide_drive_t *drive)
 {
         idetape_tape_t *tape = drive->driver_data;
@@ -2679,7 +2642,7 @@ static int ide_tape_probe(ide_drive_t *drive)
         if (drive->media != ide_tape)
                 goto failed;
 
-        if (!idetape_identify_device(drive)) {
+        if (drive->id_read == 1 && !ide_check_atapi_device(drive, DRV_NAME)) {
                 printk(KERN_ERR "ide-tape: %s: not supported by this version of"
                                 " the driver\n", drive->name);
                 goto failed;