ide-floppy: remove needless parens

[linux-2.6-omap-h63xx.git] / drivers / ide / ide-floppy.c

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index de8d42b3f698faff87fcdc4c51aa610aac486fd6..6a944cb7054f5615ba0ff9e472985006dc76df1d 100644 (file)
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -15,6 +15,8 @@
  * Documentation/ide/ChangeLog.ide-floppy.1996-2002
  */
 
+#define DRV_NAME "ide-floppy"
+
 #define IDEFLOPPY_VERSION "1.00"
 
 #include <linux/module.h>
@@ -736,7 +738,7 @@ static int idefloppy_get_sfrp_bit(ide_drive_t *drive)
                return 1;
 
        floppy->srfp = pc.buf[8 + 2] & 0x40;
-       return (0);
+       return 0;
 }
 
 /*
@@ -864,16 +866,17 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive, int __user *arg)
        int __user *argp;
 
        if (get_user(u_array_size, arg))
-               return (-EFAULT);
+               return -EFAULT;
 
        if (u_array_size <= 0)
-               return (-EINVAL);
+               return -EINVAL;
 
        idefloppy_create_read_capacity_cmd(&pc);
        if (idefloppy_queue_pc_tail(drive, &pc)) {
                printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n");
-               return (-EIO);
+               return -EIO;
        }
+
        header_len = pc.buf[3];
        desc_cnt = header_len / 8; /* capacity descriptor of 8 bytes */
 
@@ -895,19 +898,22 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive, int __user *arg)
                length = be16_to_cpup((__be16 *)&pc.buf[desc_start + 6]);
 
                if (put_user(blocks, argp))
-                       return(-EFAULT);
+                       return -EFAULT;
+
                ++argp;
 
                if (put_user(length, argp))
-                       return (-EFAULT);
+                       return -EFAULT;
+
                ++argp;
 
                ++u_index;
        }
 
        if (put_user(u_index, arg))
-               return (-EFAULT);
-       return (0);
+               return -EFAULT;
+
+       return 0;
 }
 
 /*
@@ -929,7 +935,7 @@ static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg)
        if (floppy->srfp) {
                idefloppy_create_request_sense_cmd(&pc);
                if (idefloppy_queue_pc_tail(drive, &pc))
-                       return (-EIO);
+                       return -EIO;
 
                if (floppy->sense_key == 2 &&
                    floppy->asc == 4 &&
@@ -948,10 +954,11 @@ static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg)
 
                progress_indication = ((stat & ATA_DSC) == 0) ? 0 : 0x10000;
        }
+
        if (put_user(progress_indication, arg))
-               return (-EFAULT);
+               return -EFAULT;
 
-       return (0);
+       return 0;
 }
 
 static sector_t idefloppy_capacity(ide_drive_t *drive)
@@ -962,50 +969,6 @@ static sector_t idefloppy_capacity(ide_drive_t *drive)
        return capacity;
 }
 
-/*
- * Check whether we can support a drive, based on the ATAPI IDENTIFY command
- * results.
- */
-static int idefloppy_identify_device(ide_drive_t *drive, u16 *id)
-{
-       u8 gcw[2];
-       u8 device_type, protocol, removable, drq_type, packet_size;
-
-       *((u16 *)&gcw) = id[ATA_ID_CONFIG];
-
-       device_type =  gcw[1] & 0x1F;
-       removable   = (gcw[0] & 0x80) >> 7;
-       protocol    = (gcw[1] & 0xC0) >> 6;
-       drq_type    = (gcw[0] & 0x60) >> 5;
-       packet_size =  gcw[0] & 0x03;
-
-#ifdef CONFIG_PPC
-       /* kludge for Apple PowerBook internal zip */
-       if (device_type == 5 &&
-           !strstr((char *)&id[ATA_ID_PROD], "CD-ROM") &&
-           strstr((char *)&id[ATA_ID_PROD], "ZIP"))
-               device_type = 0;
-#endif
-
-       if (protocol != 2)
-               printk(KERN_ERR "ide-floppy: Protocol (0x%02x) is not ATAPI\n",
-                       protocol);
-       else if (device_type != 0)
-               printk(KERN_ERR "ide-floppy: Device type (0x%02x) is not set "
-                               "to floppy\n", device_type);
-       else if (!removable)
-               printk(KERN_ERR "ide-floppy: The removable flag is not set\n");
-       else if (drq_type == 3)
-               printk(KERN_ERR "ide-floppy: Sorry, DRQ type (0x%02x) not "
-                               "supported\n", drq_type);
-       else if (packet_size != 0)
-               printk(KERN_ERR "ide-floppy: Packet size (0x%02x) is not 12 "
-                               "bytes\n", packet_size);
-       else
-               return 1;
-       return 0;
-}
-
 #ifdef CONFIG_IDE_PROC_FS
 ide_devset_rw(bios_cyl,  0, 1023, bios_cyl);
 ide_devset_rw(bios_head, 0,  255, bios_head);
@@ -1407,7 +1370,7 @@ static int ide_floppy_probe(ide_drive_t *drive)
        if (drive->media != ide_floppy)
                goto failed;
 
-       if (!idefloppy_identify_device(drive, drive->id)) {
+       if (!ide_check_atapi_device(drive, DRV_NAME)) {
                printk(KERN_ERR "ide-floppy: %s: not supported by this version"
                                " of ide-floppy\n", drive->name);
                goto failed;