diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2007-07-09 17:17:54 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-09 17:17:54 -0400 |
commit | 841d2a9bf16471716ba3a5172d24aa40a2ea9398 (patch) | |
tree | f836d41ed70bf3efd6350c293c0c31a40ef4f900 /drivers/ide/ppc/pmac.c | |
parent | b740d8846e2e184909e9f74d4ad9d67ae0e084ea (diff) |
ide: make void and rename ide_dma_lostirq() method
Since ide_dma_lostirq() method's result is discarded, make it return 'void'.
While at it, rename the method to dma_lost_irq(), drop the '__' prefix from the
default method's name, and do some cleanups in this method driver-wise:
- in aec62xx.c, rename the method in accordance with other drivers, and get rid
of unnecessary variables there;
- in pdc202xx_old.c, define/use 'hwif' variable;
- in sgiioc4.c, rearrange the code to call the resetproc() method directly.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ppc/pmac.c')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 45fc36f0f219..ca72ad202ebc 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -2004,20 +2004,19 @@ static void pmac_ide_dma_host_on(ide_drive_t *drive) | |||
2004 | { | 2004 | { |
2005 | } | 2005 | } |
2006 | 2006 | ||
2007 | static int | 2007 | static void |
2008 | pmac_ide_dma_lostirq (ide_drive_t *drive) | 2008 | pmac_ide_dma_lost_irq (ide_drive_t *drive) |
2009 | { | 2009 | { |
2010 | pmac_ide_hwif_t* pmif = (pmac_ide_hwif_t *)HWIF(drive)->hwif_data; | 2010 | pmac_ide_hwif_t* pmif = (pmac_ide_hwif_t *)HWIF(drive)->hwif_data; |
2011 | volatile struct dbdma_regs __iomem *dma; | 2011 | volatile struct dbdma_regs __iomem *dma; |
2012 | unsigned long status; | 2012 | unsigned long status; |
2013 | 2013 | ||
2014 | if (pmif == NULL) | 2014 | if (pmif == NULL) |
2015 | return 0; | 2015 | return; |
2016 | dma = pmif->dma_regs; | 2016 | dma = pmif->dma_regs; |
2017 | 2017 | ||
2018 | status = readl(&dma->status); | 2018 | status = readl(&dma->status); |
2019 | printk(KERN_ERR "ide-pmac lost interrupt, dma status: %lx\n", status); | 2019 | printk(KERN_ERR "ide-pmac lost interrupt, dma status: %lx\n", status); |
2020 | return 0; | ||
2021 | } | 2020 | } |
2022 | 2021 | ||
2023 | /* | 2022 | /* |
@@ -2058,7 +2057,7 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
2058 | hwif->dma_host_off = &pmac_ide_dma_host_off; | 2057 | hwif->dma_host_off = &pmac_ide_dma_host_off; |
2059 | hwif->dma_host_on = &pmac_ide_dma_host_on; | 2058 | hwif->dma_host_on = &pmac_ide_dma_host_on; |
2060 | hwif->ide_dma_timeout = &__ide_dma_timeout; | 2059 | hwif->ide_dma_timeout = &__ide_dma_timeout; |
2061 | hwif->ide_dma_lostirq = &pmac_ide_dma_lostirq; | 2060 | hwif->dma_lost_irq = &pmac_ide_dma_lost_irq; |
2062 | 2061 | ||
2063 | hwif->atapi_dma = 1; | 2062 | hwif->atapi_dma = 1; |
2064 | switch(pmif->kind) { | 2063 | switch(pmif->kind) { |