5 files changed, 9 insertions, 7 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 2e43ae15fb1b..474070c1ddb6 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -539,13 +539,14 @@ static int proc_idedisk_read_smart(char *page, char **start, off_t off,
 
         if (get_smart_data(drive, page, sub_cmd) == 0) {
                 unsigned short *val = (unsigned short *) page;
-                char *out = ((char *)val) + (SECTOR_WORDS * 4);
+                char *out = (char *)val + SECTOR_SIZE;
+
                 page = out;
                 do {
                         out += sprintf(out, "%04x%c", le16_to_cpu(*val),
                                        (++i & 7) ? ' ' : '\n');
                         val += 1;
-                } while (i < (SECTOR_WORDS * 2));
+                } while (i < SECTOR_SIZE / 2);
                 len = out - page;
         }
 
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index ee44878e40d0..6256c2df62cc 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -693,7 +693,7 @@ int ide_driveid_update(ide_drive_t *drive)
         }
         local_irq_save(flags);
         SELECT_MASK(drive, 0);
-        id = kmalloc(SECTOR_WORDS*4, GFP_ATOMIC);
+        id = kmalloc(SECTOR_SIZE, GFP_ATOMIC);
         if (!id) {
                 local_irq_restore(flags);
                 return 0;
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 62f7e1ef10c1..be121ffcc1dc 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -561,7 +561,7 @@ static inline u8 probe_for_drive (ide_drive_t *drive)
          *      Also note that 0 everywhere means "can't do X"
          */
  
-        drive->id = kzalloc(SECTOR_WORDS *4, GFP_KERNEL);
+        drive->id = kzalloc(SECTOR_SIZE, GFP_KERNEL);
         drive->id_read = 0;
         if(drive->id == NULL)
         {
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index 5634b3971d21..6489c647be82 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -100,13 +100,14 @@ static int proc_ide_read_identify
 
                 err = taskfile_lib_get_identify(drive, page);
                 if (!err) {
-                        char *out = ((char *)page) + (SECTOR_WORDS * 4);
+                        char *out = (char *)page + SECTOR_SIZE;
+
                         page = out;
                         do {
                                 out += sprintf(out, "%04x%c",
                                         le16_to_cpup(val), (++i & 7) ? ' ' : '\n');
                                 val += 1;
-                        } while (i < (SECTOR_WORDS * 2));
+                        } while (i < SECTOR_SIZE / 2);
                         len = out - page;
                 }
         }
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index b1fb815dbf68..7ffe9004a4d6 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -768,7 +768,7 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
         if (args[3]) {
                 tfargs.tf_flags |= IDE_TFLAG_IO_16BIT;
-                bufsize = SECTOR_WORDS * 4 * args[3];
+                bufsize = SECTOR_SIZE * args[3];
                 buf = kzalloc(bufsize, GFP_KERNEL);
                 if (buf == NULL)
                         return -ENOMEM;