ide: pmac: Remove casting the return value which is a void pointer

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Casting the return value which is a void pointer is redundant.
The conversion from void pointer to any other pointer type is
guaranteed by the C programming language.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jingoo Han and committed by

David S. Miller 12 years ago 58e48be7 4fbf888a

+17 -34

1 changed file

expand all

drivers

ide

pmac.c

+17 -34

drivers/ide/pmac.c

··· 416 416 static void pmac_ide_apply_timings(ide_drive_t *drive) 417 417 { 418 418 ide_hwif_t *hwif = drive->hwif; 419 - pmac_ide_hwif_t *pmif = 420 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 419 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 421 420 422 421 if (drive->dn & 1) 423 422 writel(pmif->timings[1], PMAC_IDE_REG(IDE_TIMING_CONFIG)); ··· 433 434 static void pmac_ide_kauai_apply_timings(ide_drive_t *drive) 434 435 { 435 436 ide_hwif_t *hwif = drive->hwif; 436 - pmac_ide_hwif_t *pmif = 437 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 437 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 438 438 439 439 if (drive->dn & 1) { 440 440 writel(pmif->timings[1], PMAC_IDE_REG(IDE_KAUAI_PIO_CONFIG)); ··· 452 454 pmac_ide_do_update_timings(ide_drive_t *drive) 453 455 { 454 456 ide_hwif_t *hwif = drive->hwif; 455 - pmac_ide_hwif_t *pmif = 456 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 457 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 457 458 458 459 if (pmif->kind == controller_sh_ata6 || 459 460 pmif->kind == controller_un_ata6 || ··· 497 500 */ 498 501 static void pmac_ide_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) 499 502 { 500 - pmac_ide_hwif_t *pmif = 501 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 503 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 502 504 const u8 pio = drive->pio_mode - XFER_PIO_0; 503 505 struct ide_timing *tim = ide_timing_find_mode(XFER_PIO_0 + pio); 504 506 u32 *timings, t; ··· 777 781 778 782 static void pmac_ide_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive) 779 783 { 780 - pmac_ide_hwif_t *pmif = 781 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 784 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 782 785 int ret = 0; 783 786 u32 *timings, *timings2, tl[2]; 784 787 u8 unit = drive->dn & 1; ··· 914 919 915 920 static u8 pmac_ide_cable_detect(ide_hwif_t *hwif) 916 921 { 917 - pmac_ide_hwif_t *pmif = 918 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 922 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 919 923 struct device_node *np = pmif->node; 920 924 const char *cable = of_get_property(np, "cable-type", NULL); 921 925 struct device_node *root = of_find_node_by_path("/"); ··· 945 951 static void pmac_ide_init_dev(ide_drive_t *drive) 946 952 { 947 953 ide_hwif_t *hwif = drive->hwif; 948 - pmac_ide_hwif_t *pmif = 949 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 954 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 950 955 951 956 if (on_media_bay(pmif)) { 952 957 if (check_media_bay(pmif->mdev->media_bay) == MB_CD) { ··· 1221 1228 static int 1222 1229 pmac_ide_macio_suspend(struct macio_dev *mdev, pm_message_t mesg) 1223 1230 { 1224 - pmac_ide_hwif_t *pmif = 1225 - (pmac_ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev); 1231 + pmac_ide_hwif_t *pmif = dev_get_drvdata(&mdev->ofdev.dev); 1226 1232 int rc = 0; 1227 1233 1228 1234 if (mesg.event != mdev->ofdev.dev.power.power_state.event ··· 1237 1245 static int 1238 1246 pmac_ide_macio_resume(struct macio_dev *mdev) 1239 1247 { 1240 - pmac_ide_hwif_t *pmif = 1241 - (pmac_ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev); 1248 + pmac_ide_hwif_t *pmif = dev_get_drvdata(&mdev->ofdev.dev); 1242 1249 int rc = 0; 1243 1250 1244 1251 if (mdev->ofdev.dev.power.power_state.event != PM_EVENT_ON) { ··· 1356 1365 #ifdef CONFIG_PMAC_MEDIABAY 1357 1366 static void pmac_ide_macio_mb_event(struct macio_dev* mdev, int mb_state) 1358 1367 { 1359 - pmac_ide_hwif_t *pmif = 1360 - (pmac_ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev); 1368 + pmac_ide_hwif_t *pmif = dev_get_drvdata(&mdev->ofdev.dev); 1361 1369 1362 1370 switch(mb_state) { 1363 1371 case MB_CD: ··· 1458 1468 static int pmac_ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd) 1459 1469 { 1460 1470 ide_hwif_t *hwif = drive->hwif; 1461 - pmac_ide_hwif_t *pmif = 1462 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 1471 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 1463 1472 struct dbdma_cmd *table; 1464 1473 volatile struct dbdma_regs __iomem *dma = pmif->dma_regs; 1465 1474 struct scatterlist *sg; ··· 1535 1546 static int pmac_ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd) 1536 1547 { 1537 1548 ide_hwif_t *hwif = drive->hwif; 1538 - pmac_ide_hwif_t *pmif = 1539 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 1549 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 1540 1550 u8 unit = drive->dn & 1, ata4 = (pmif->kind == controller_kl_ata4); 1541 1551 u8 write = !!(cmd->tf_flags & IDE_TFLAG_WRITE); 1542 1552 ··· 1560 1572 pmac_ide_dma_start(ide_drive_t *drive) 1561 1573 { 1562 1574 ide_hwif_t *hwif = drive->hwif; 1563 - pmac_ide_hwif_t *pmif = 1564 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 1575 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 1565 1576 volatile struct dbdma_regs __iomem *dma; 1566 1577 1567 1578 dma = pmif->dma_regs; ··· 1577 1590 pmac_ide_dma_end (ide_drive_t *drive) 1578 1591 { 1579 1592 ide_hwif_t *hwif = drive->hwif; 1580 - pmac_ide_hwif_t *pmif = 1581 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 1593 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 1582 1594 volatile struct dbdma_regs __iomem *dma = pmif->dma_regs; 1583 1595 u32 dstat; 1584 1596 ··· 1601 1615 pmac_ide_dma_test_irq (ide_drive_t *drive) 1602 1616 { 1603 1617 ide_hwif_t *hwif = drive->hwif; 1604 - pmac_ide_hwif_t *pmif = 1605 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 1618 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 1606 1619 volatile struct dbdma_regs __iomem *dma = pmif->dma_regs; 1607 1620 unsigned long status, timeout; 1608 1621 ··· 1655 1670 pmac_ide_dma_lost_irq (ide_drive_t *drive) 1656 1671 { 1657 1672 ide_hwif_t *hwif = drive->hwif; 1658 - pmac_ide_hwif_t *pmif = 1659 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 1673 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 1660 1674 volatile struct dbdma_regs __iomem *dma = pmif->dma_regs; 1661 1675 unsigned long status = readl(&dma->status); 1662 1676 ··· 1677 1693 */ 1678 1694 static int pmac_ide_init_dma(ide_hwif_t *hwif, const struct ide_port_info *d) 1679 1695 { 1680 - pmac_ide_hwif_t *pmif = 1681 - (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); 1696 + pmac_ide_hwif_t *pmif = dev_get_drvdata(hwif->gendev.parent); 1682 1697 struct pci_dev *dev = to_pci_dev(hwif->dev); 1683 1698 1684 1699 /* We won't need pci_dev if we switch to generic consistent