diff options
Diffstat (limited to 'drivers/dma/sh/shdma.c')
| -rw-r--r-- | drivers/dma/sh/shdma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c index f41bcc5267fd..8201bb4e0cd7 100644 --- a/drivers/dma/sh/shdma.c +++ b/drivers/dma/sh/shdma.c | |||
| @@ -483,7 +483,7 @@ static struct notifier_block sh_dmae_nmi_notifier __read_mostly = { | |||
| 483 | .priority = 1, | 483 | .priority = 1, |
| 484 | }; | 484 | }; |
| 485 | 485 | ||
| 486 | static int __devinit sh_dmae_chan_probe(struct sh_dmae_device *shdev, int id, | 486 | static int sh_dmae_chan_probe(struct sh_dmae_device *shdev, int id, |
| 487 | int irq, unsigned long flags) | 487 | int irq, unsigned long flags) |
| 488 | { | 488 | { |
| 489 | const struct sh_dmae_channel *chan_pdata = &shdev->pdata->channel[id]; | 489 | const struct sh_dmae_channel *chan_pdata = &shdev->pdata->channel[id]; |
| @@ -646,7 +646,7 @@ static const struct shdma_ops sh_dmae_shdma_ops = { | |||
| 646 | .get_partial = sh_dmae_get_partial, | 646 | .get_partial = sh_dmae_get_partial, |
| 647 | }; | 647 | }; |
| 648 | 648 | ||
| 649 | static int __devinit sh_dmae_probe(struct platform_device *pdev) | 649 | static int sh_dmae_probe(struct platform_device *pdev) |
| 650 | { | 650 | { |
| 651 | struct sh_dmae_pdata *pdata = pdev->dev.platform_data; | 651 | struct sh_dmae_pdata *pdata = pdev->dev.platform_data; |
| 652 | unsigned long irqflags = IRQF_DISABLED, | 652 | unsigned long irqflags = IRQF_DISABLED, |
| @@ -926,7 +926,7 @@ static struct platform_driver sh_dmae_driver = { | |||
| 926 | .pm = &sh_dmae_pm, | 926 | .pm = &sh_dmae_pm, |
| 927 | .name = SH_DMAE_DRV_NAME, | 927 | .name = SH_DMAE_DRV_NAME, |
| 928 | }, | 928 | }, |
| 929 | .remove = __devexit_p(sh_dmae_remove), | 929 | .remove = sh_dmae_remove, |
| 930 | .shutdown = sh_dmae_shutdown, | 930 | .shutdown = sh_dmae_shutdown, |
| 931 | }; | 931 | }; |
| 932 | 932 | ||
