diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-22 22:08:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-22 22:08:32 -0700 |
commit | d798f7f080805ad7e15fc37a43d8c6f91edb6dda (patch) | |
tree | 73e3783cb619d3a5dc40a5f32859f063b5cd0664 /drivers/ide/pmac.c | |
parent | e98bae7592a44bdce2e49ccd64f3c7ffe244a0f6 (diff) | |
parent | db210f824c2f155703edf03bc2137da1bd76e27d (diff) | |
download | kernel_samsung_smdk4412-d798f7f080805ad7e15fc37a43d8c6f91edb6dda.tar.gz kernel_samsung_smdk4412-d798f7f080805ad7e15fc37a43d8c6f91edb6dda.tar.bz2 kernel_samsung_smdk4412-d798f7f080805ad7e15fc37a43d8c6f91edb6dda.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide/ide-scan-pci.c: Use for_each_pci_dev().
ide: Use linux/mutex.h
IDE: ide-floppy, remove unnecessary NULL check
drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdata
ide: fix use after free in ide-acpi
Diffstat (limited to 'drivers/ide/pmac.c')
-rw-r--r-- | drivers/ide/pmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c index ebcf8e470a9..1db7c4368db 100644 --- a/drivers/ide/pmac.c +++ b/drivers/ide/pmac.c @@ -1334,7 +1334,7 @@ out_free_pmif: static int pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t mesg) { - pmac_ide_hwif_t *pmif = (pmac_ide_hwif_t *)pci_get_drvdata(pdev); + pmac_ide_hwif_t *pmif = pci_get_drvdata(pdev); int rc = 0; if (mesg.event != pdev->dev.power.power_state.event @@ -1350,7 +1350,7 @@ pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t mesg) static int pmac_ide_pci_resume(struct pci_dev *pdev) { - pmac_ide_hwif_t *pmif = (pmac_ide_hwif_t *)pci_get_drvdata(pdev); + pmac_ide_hwif_t *pmif = pci_get_drvdata(pdev); int rc = 0; if (pdev->dev.power.power_state.event != PM_EVENT_ON) { |