diff options
Diffstat (limited to 'drivers/ata/sata_sx4.c')
-rw-r--r-- | drivers/ata/sata_sx4.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c index 9947010afc0f..39b5de60a1f9 100644 --- a/drivers/ata/sata_sx4.c +++ b/drivers/ata/sata_sx4.c | |||
@@ -82,7 +82,6 @@ | |||
82 | #include <linux/module.h> | 82 | #include <linux/module.h> |
83 | #include <linux/pci.h> | 83 | #include <linux/pci.h> |
84 | #include <linux/slab.h> | 84 | #include <linux/slab.h> |
85 | #include <linux/init.h> | ||
86 | #include <linux/blkdev.h> | 85 | #include <linux/blkdev.h> |
87 | #include <linux/delay.h> | 86 | #include <linux/delay.h> |
88 | #include <linux/interrupt.h> | 87 | #include <linux/interrupt.h> |
@@ -1021,8 +1020,7 @@ static void pdc20621_get_from_dimm(struct ata_host *host, void *psource, | |||
1021 | idx++; | 1020 | idx++; |
1022 | dist = ((long) (window_size - (offset + size))) >= 0 ? size : | 1021 | dist = ((long) (window_size - (offset + size))) >= 0 ? size : |
1023 | (long) (window_size - offset); | 1022 | (long) (window_size - offset); |
1024 | memcpy_fromio((char *) psource, (char *) (dimm_mmio + offset / 4), | 1023 | memcpy_fromio(psource, dimm_mmio + offset / 4, dist); |
1025 | dist); | ||
1026 | 1024 | ||
1027 | psource += dist; | 1025 | psource += dist; |
1028 | size -= dist; | 1026 | size -= dist; |
@@ -1031,8 +1029,7 @@ static void pdc20621_get_from_dimm(struct ata_host *host, void *psource, | |||
1031 | readl(mmio + PDC_GENERAL_CTLR); | 1029 | readl(mmio + PDC_GENERAL_CTLR); |
1032 | writel(((idx) << page_mask), mmio + PDC_DIMM_WINDOW_CTLR); | 1030 | writel(((idx) << page_mask), mmio + PDC_DIMM_WINDOW_CTLR); |
1033 | readl(mmio + PDC_DIMM_WINDOW_CTLR); | 1031 | readl(mmio + PDC_DIMM_WINDOW_CTLR); |
1034 | memcpy_fromio((char *) psource, (char *) (dimm_mmio), | 1032 | memcpy_fromio(psource, dimm_mmio, window_size / 4); |
1035 | window_size / 4); | ||
1036 | psource += window_size; | 1033 | psource += window_size; |
1037 | size -= window_size; | 1034 | size -= window_size; |
1038 | idx++; | 1035 | idx++; |
@@ -1043,8 +1040,7 @@ static void pdc20621_get_from_dimm(struct ata_host *host, void *psource, | |||
1043 | readl(mmio + PDC_GENERAL_CTLR); | 1040 | readl(mmio + PDC_GENERAL_CTLR); |
1044 | writel(((idx) << page_mask), mmio + PDC_DIMM_WINDOW_CTLR); | 1041 | writel(((idx) << page_mask), mmio + PDC_DIMM_WINDOW_CTLR); |
1045 | readl(mmio + PDC_DIMM_WINDOW_CTLR); | 1042 | readl(mmio + PDC_DIMM_WINDOW_CTLR); |
1046 | memcpy_fromio((char *) psource, (char *) (dimm_mmio), | 1043 | memcpy_fromio(psource, dimm_mmio, size / 4); |
1047 | size / 4); | ||
1048 | } | 1044 | } |
1049 | } | 1045 | } |
1050 | #endif | 1046 | #endif |