3 files changed, 9 insertions, 15 deletions

diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index 7bed8d806381..17159b5e1e43 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -271,14 +271,12 @@ static void pdc_data_xfer_vlb(struct ata_device *adev, unsigned char *buf, unsig
                         ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
 
                 if (unlikely(slop)) {
-                        u32 pad;
+                        __le32 pad = 0;
                         if (write_data) {
                                 memcpy(&pad, buf + buflen - slop, slop);
-                                pad = le32_to_cpu(pad);
-                                iowrite32(pad, ap->ioaddr.data_addr);
+                                iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
                         } else {
-                                pad = ioread32(ap->ioaddr.data_addr);
-                                pad = cpu_to_le16(pad);
+                                pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
                                 memcpy(buf + buflen - slop, &pad, slop);
                         }
                 }
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index 7d4c696c4cb6..a4c0e502cb42 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -136,14 +136,12 @@ static void qdi_data_xfer(struct ata_device *adev, unsigned char *buf, unsigned
                         ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
 
                 if (unlikely(slop)) {
-                        u32 pad;
+                        __le32 pad = 0;
                         if (write_data) {
                                 memcpy(&pad, buf + buflen - slop, slop);
-                                pad = le32_to_cpu(pad);
-                                iowrite32(pad, ap->ioaddr.data_addr);
+                                iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
                         } else {
-                                pad = ioread32(ap->ioaddr.data_addr);
-                                pad = cpu_to_le32(pad);
+                                pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
                                 memcpy(buf + buflen - slop, &pad, slop);
                         }
                 }
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index 311cdb3a5566..7116a9e7a8b2 100644
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -104,14 +104,12 @@ static void winbond_data_xfer(struct ata_device *adev, unsigned char *buf, unsig
                         ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
 
                 if (unlikely(slop)) {
-                        u32 pad;
+                        __le32 pad = 0;
                         if (write_data) {
                                 memcpy(&pad, buf + buflen - slop, slop);
-                                pad = le32_to_cpu(pad);
-                                iowrite32(pad, ap->ioaddr.data_addr);
+                                iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
                         } else {
-                                pad = ioread32(ap->ioaddr.data_addr);
-                                pad = cpu_to_le16(pad);
+                                pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
                                 memcpy(buf + buflen - slop, &pad, slop);
                         }
                 }