aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-03-26 12:34:49 -0400
committerTejun Heo <tj@kernel.org>2014-03-26 12:36:53 -0400
commitd5185d655c1fc4dfd467303f45ba4496ad84ddf9 (patch)
tree2ef67e53daed91748cbd27a23887c3c25f0257d9
parenta498e31643c1e9981fde87556bc4f6133e2fd989 (diff)
ata: remove superfluous casts
Unreferenced casts of void * types are unnecessary so remove them. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--drivers/ata/libahci.c2
-rw-r--r--drivers/ata/pata_arasan_cf.c2
-rw-r--r--drivers/ata/sata_dwc_460ex.c3
-rw-r--r--drivers/ata/sata_sx4.c9
4 files changed, 6 insertions, 10 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 7985ae782679..6bd4f660b4e1 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1636,7 +1636,7 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat)
1636 } 1636 }
1637 1637
1638 if (irq_stat & PORT_IRQ_UNK_FIS) { 1638 if (irq_stat & PORT_IRQ_UNK_FIS) {
1639 u32 *unk = (u32 *)(pp->rx_fis + RX_FIS_UNK); 1639 u32 *unk = pp->rx_fis + RX_FIS_UNK;
1640 1640
1641 active_ehi->err_mask |= AC_ERR_HSM; 1641 active_ehi->err_mask |= AC_ERR_HSM;
1642 active_ehi->action |= ATA_EH_RESET; 1642 active_ehi->action |= ATA_EH_RESET;
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 73492dd4a4bc..6fac524c2f50 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -356,7 +356,7 @@ static void cf_exit(struct arasan_cf_dev *acdev)
356 356
357static void dma_callback(void *dev) 357static void dma_callback(void *dev)
358{ 358{
359 struct arasan_cf_dev *acdev = (struct arasan_cf_dev *) dev; 359 struct arasan_cf_dev *acdev = dev;
360 360
361 complete(&acdev->dma_completion); 361 complete(&acdev->dma_completion);
362} 362}
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index 73510d0d1406..0bb2cabd2197 100644
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -461,8 +461,7 @@ static irqreturn_t dma_dwc_interrupt(int irq, void *hsdev_instance)
461 int chan; 461 int chan;
462 u32 tfr_reg, err_reg; 462 u32 tfr_reg, err_reg;
463 unsigned long flags; 463 unsigned long flags;
464 struct sata_dwc_device *hsdev = 464 struct sata_dwc_device *hsdev = hsdev_instance;
465 (struct sata_dwc_device *)hsdev_instance;
466 struct ata_host *host = (struct ata_host *)hsdev->host; 465 struct ata_host *host = (struct ata_host *)hsdev->host;
467 struct ata_port *ap; 466 struct ata_port *ap;
468 struct sata_dwc_device_port *hsdevp; 467 struct sata_dwc_device_port *hsdevp;
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 6cd0312be484..39b5de60a1f9 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -1020,8 +1020,7 @@ static void pdc20621_get_from_dimm(struct ata_host *host, void *psource,
1020 idx++; 1020 idx++;
1021 dist = ((long) (window_size - (offset + size))) >= 0 ? size : 1021 dist = ((long) (window_size - (offset + size))) >= 0 ? size :
1022 (long) (window_size - offset); 1022 (long) (window_size - offset);
1023 memcpy_fromio((char *) psource, (char *) (dimm_mmio + offset / 4), 1023 memcpy_fromio(psource, dimm_mmio + offset / 4, dist);
1024 dist);
1025 1024
1026 psource += dist; 1025 psource += dist;
1027 size -= dist; 1026 size -= dist;
@@ -1030,8 +1029,7 @@ static void pdc20621_get_from_dimm(struct ata_host *host, void *psource,
1030 readl(mmio + PDC_GENERAL_CTLR); 1029 readl(mmio + PDC_GENERAL_CTLR);
1031 writel(((idx) << page_mask), mmio + PDC_DIMM_WINDOW_CTLR); 1030 writel(((idx) << page_mask), mmio + PDC_DIMM_WINDOW_CTLR);
1032 readl(mmio + PDC_DIMM_WINDOW_CTLR); 1031 readl(mmio + PDC_DIMM_WINDOW_CTLR);
1033 memcpy_fromio((char *) psource, (char *) (dimm_mmio), 1032 memcpy_fromio(psource, dimm_mmio, window_size / 4);
1034 window_size / 4);
1035 psource += window_size; 1033 psource += window_size;
1036 size -= window_size; 1034 size -= window_size;
1037 idx++; 1035 idx++;
@@ -1042,8 +1040,7 @@ static void pdc20621_get_from_dimm(struct ata_host *host, void *psource,
1042 readl(mmio + PDC_GENERAL_CTLR); 1040 readl(mmio + PDC_GENERAL_CTLR);
1043 writel(((idx) << page_mask), mmio + PDC_DIMM_WINDOW_CTLR); 1041 writel(((idx) << page_mask), mmio + PDC_DIMM_WINDOW_CTLR);
1044 readl(mmio + PDC_DIMM_WINDOW_CTLR); 1042 readl(mmio + PDC_DIMM_WINDOW_CTLR);
1045 memcpy_fromio((char *) psource, (char *) (dimm_mmio), 1043 memcpy_fromio(psource, dimm_mmio, size / 4);
1046 size / 4);
1047 } 1044 }
1048} 1045}
1049#endif 1046#endif