diff options
| author | Bill Pemberton | 2012-11-19 19:22:55 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-11-28 21:42:36 +0100 |
| commit | 463a1f8b3ceebe990ca9a8c7cc2e51ee42cb48eb (patch) | |
| tree | 7b9c4b6dec935a71493e7e05e51448b3fc5e8cce /drivers/dma/sh | |
| parent | dma: remove use of __devexit_p (diff) | |
| download | kernel-qcow2-linux-463a1f8b3ceebe990ca9a8c7cc2e51ee42cb48eb.tar.gz kernel-qcow2-linux-463a1f8b3ceebe990ca9a8c7cc2e51ee42cb48eb.tar.xz kernel-qcow2-linux-463a1f8b3ceebe990ca9a8c7cc2e51ee42cb48eb.zip | |
dma: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Li Yang <leoli@freescale.com>
Cc: Zhang Wei <zw@zh-kernel.org>
Cc: Barry Song <baohua.song@csr.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/dma/sh')
| -rw-r--r-- | drivers/dma/sh/shdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c index 7dcf4e073186..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 = { .priority = 1, }; -static int __devinit sh_dmae_chan_probe(struct sh_dmae_device *shdev, int id, +static int sh_dmae_chan_probe(struct sh_dmae_device *shdev, int id, int irq, unsigned long flags) { const struct sh_dmae_channel *chan_pdata = &shdev->pdata->channel[id]; @@ -646,7 +646,7 @@ static const struct shdma_ops sh_dmae_shdma_ops = { .get_partial = sh_dmae_get_partial, }; -static int __devinit sh_dmae_probe(struct platform_device *pdev) +static int sh_dmae_probe(struct platform_device *pdev) { struct sh_dmae_pdata *pdata = pdev->dev.platform_data; unsigned long irqflags = IRQF_DISABLED, |