Merge branch 'for-4.9/block' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / drivers / block / swim3.c

diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 523ee8f..c264f2d 100644 (file)
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -440,9 +440,9 @@ static inline void seek_track(struct floppy_state *fs, int n)
 static inline void init_dma(struct dbdma_cmd *cp, int cmd,
                            void *buf, int count)
 {
-       st_le16(&cp->req_count, count);
-       st_le16(&cp->command, cmd);
-       st_le32(&cp->phy_addr, virt_to_bus(buf));
+       cp->req_count = cpu_to_le16(count);
+       cp->command = cpu_to_le16(cmd);
+       cp->phy_addr = cpu_to_le32(virt_to_bus(buf));
        cp->xfer_status = 0;
 }
 
@@ -771,8 +771,8 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id)
                }
                /* turn off DMA */
                out_le32(&dr->control, (RUN | PAUSE) << 16);
-               stat = ld_le16(&cp->xfer_status);
-               resid = ld_le16(&cp->res_count);
+               stat = le16_to_cpu(cp->xfer_status);
+               resid = le16_to_cpu(cp->res_count);
                if (intr & ERROR_INTR) {
                        n = fs->scount - 1 - resid / 512;
                        if (n > 0) {
@@ -1170,7 +1170,7 @@ static int swim3_add_device(struct macio_dev *mdev, int index)
 
        fs->dma_cmd = (struct dbdma_cmd *) DBDMA_ALIGN(fs->dbdma_cmd_space);
        memset(fs->dma_cmd, 0, 2 * sizeof(struct dbdma_cmd));
-       st_le16(&fs->dma_cmd[1].command, DBDMA_STOP);
+       fs->dma_cmd[1].command = cpu_to_le16(DBDMA_STOP);
 
        if (mdev->media_bay == NULL || check_media_bay(mdev->media_bay) == MB_FD)
                swim3_mb_event(mdev, MB_FD);