Skip to content

L
linux
Commit 463a1f8b authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files
Options

dma: remove use of __devinit 

CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: default avatarBill 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: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a7d6e3ec
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
drivers/dma/dw_dmac.c
View file @ 463a1f8b
...@@ -1462,7 +1462,7 @@ static void dw_dma_off(struct dw_dma *dw) ...@@ -1462,7 +1462,7 @@ static void dw_dma_off(struct dw_dma *dw)
dw->chan[i].initialized = false; dw->chan[i].initialized = false;
} }
static int __devinit dw_probe(struct platform_device *pdev) static int dw_probe(struct platform_device *pdev)
{ {
struct dw_dma_platform_data *pdata; struct dw_dma_platform_data *pdata;
struct resource *io; struct resource *io;
......
drivers/dma/edma.c
View file @ 463a1f8b
...@@ -545,7 +545,7 @@ static void edma_dma_init(struct edma_cc *ecc, struct dma_device *dma, ...@@ -545,7 +545,7 @@ static void edma_dma_init(struct edma_cc *ecc, struct dma_device *dma,
INIT_LIST_HEAD(&dma->channels); INIT_LIST_HEAD(&dma->channels);
} }
static int __devinit edma_probe(struct platform_device *pdev) static int edma_probe(struct platform_device *pdev)
{ {
struct edma_cc *ecc; struct edma_cc *ecc;
int ret; int ret;
......
drivers/dma/fsldma.c
View file @ 463a1f8b
...@@ -1221,7 +1221,7 @@ static int fsldma_request_irqs(struct fsldma_device *fdev) ...@@ -1221,7 +1221,7 @@ static int fsldma_request_irqs(struct fsldma_device *fdev)
/* OpenFirmware Subsystem */ /* OpenFirmware Subsystem */
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
static int __devinit fsl_dma_chan_probe(struct fsldma_device *fdev, static int fsl_dma_chan_probe(struct fsldma_device *fdev,
struct device_node *node, u32 feature, const char *compatible) struct device_node *node, u32 feature, const char *compatible)
{ {
struct fsldma_chan *chan; struct fsldma_chan *chan;
...@@ -1324,7 +1324,7 @@ static void fsl_dma_chan_remove(struct fsldma_chan *chan) ...@@ -1324,7 +1324,7 @@ static void fsl_dma_chan_remove(struct fsldma_chan *chan)
kfree(chan); kfree(chan);
} }
static int __devinit fsldma_of_probe(struct platform_device *op) static int fsldma_of_probe(struct platform_device *op)
{ {
struct fsldma_device *fdev; struct fsldma_device *fdev;
struct device_node *child; struct device_node *child;
......
drivers/dma/intel_mid_dma.c
View file @ 463a1f8b
...@@ -1225,7 +1225,7 @@ static void middma_shutdown(struct pci_dev *pdev) ...@@ -1225,7 +1225,7 @@ static void middma_shutdown(struct pci_dev *pdev)
* Initialize the PCI device, map BARs, query driver data. * Initialize the PCI device, map BARs, query driver data.
* Call setup_dma to complete contoller and chan initilzation * Call setup_dma to complete contoller and chan initilzation
*/ */
static int __devinit intel_mid_dma_probe(struct pci_dev *pdev, static int intel_mid_dma_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct middma_device *device; struct middma_device *device;
......
drivers/dma/iop-adma.c
View file @ 463a1f8b
...@@ -968,7 +968,7 @@ static void iop_adma_issue_pending(struct dma_chan *chan) ...@@ -968,7 +968,7 @@ static void iop_adma_issue_pending(struct dma_chan *chan)
*/ */
#define IOP_ADMA_TEST_SIZE 2000 #define IOP_ADMA_TEST_SIZE 2000
static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device) static int iop_adma_memcpy_self_test(struct iop_adma_device *device)
{ {
int i; int i;
void *src, *dest; void *src, *dest;
...@@ -1042,7 +1042,7 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device) ...@@ -1042,7 +1042,7 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device)
} }
#define IOP_ADMA_NUM_SRC_TEST 4 /* must be <= 15 */ #define IOP_ADMA_NUM_SRC_TEST 4 /* must be <= 15 */
static int __devinit static int
iop_adma_xor_val_self_test(struct iop_adma_device *device) iop_adma_xor_val_self_test(struct iop_adma_device *device)
{ {
int i, src_idx; int i, src_idx;
...@@ -1243,7 +1243,7 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device) ...@@ -1243,7 +1243,7 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device)
} }
#ifdef CONFIG_RAID6_PQ #ifdef CONFIG_RAID6_PQ
static int __devinit static int
iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device) iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device)
{ {
/* combined sources, software pq results, and extra hw pq results */ /* combined sources, software pq results, and extra hw pq results */
...@@ -1429,7 +1429,7 @@ static int __devexit iop_adma_remove(struct platform_device *dev) ...@@ -1429,7 +1429,7 @@ static int __devexit iop_adma_remove(struct platform_device *dev)
return 0; return 0;
} }
static int __devinit iop_adma_probe(struct platform_device *pdev) static int iop_adma_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
int ret = 0, i; int ret = 0, i;
......
drivers/dma/mmp_pdma.c
View file @ 463a1f8b
...@@ -720,7 +720,7 @@ static int __devexit mmp_pdma_remove(struct platform_device *op) ...@@ -720,7 +720,7 @@ static int __devexit mmp_pdma_remove(struct platform_device *op)
return 0; return 0;
} }
static int __devinit mmp_pdma_chan_init(struct mmp_pdma_device *pdev, static int mmp_pdma_chan_init(struct mmp_pdma_device *pdev,
int idx, int irq) int idx, int irq)
{ {
struct mmp_pdma_phy *phy = &pdev->phy[idx]; struct mmp_pdma_phy *phy = &pdev->phy[idx];
...@@ -764,7 +764,7 @@ static struct of_device_id mmp_pdma_dt_ids[] = { ...@@ -764,7 +764,7 @@ static struct of_device_id mmp_pdma_dt_ids[] = {
}; };
MODULE_DEVICE_TABLE(of, mmp_pdma_dt_ids); MODULE_DEVICE_TABLE(of, mmp_pdma_dt_ids);
static int __devinit mmp_pdma_probe(struct platform_device *op) static int mmp_pdma_probe(struct platform_device *op)
{ {
struct mmp_pdma_device *pdev; struct mmp_pdma_device *pdev;
const struct of_device_id *of_id; const struct of_device_id *of_id;
......
drivers/dma/mmp_tdma.c
View file @ 463a1f8b
...@@ -475,7 +475,7 @@ static int __devexit mmp_tdma_remove(struct platform_device *pdev) ...@@ -475,7 +475,7 @@ static int __devexit mmp_tdma_remove(struct platform_device *pdev)
return 0; return 0;
} }
static int __devinit mmp_tdma_chan_init(struct mmp_tdma_device *tdev, static int mmp_tdma_chan_init(struct mmp_tdma_device *tdev,
int idx, int irq, int type) int idx, int irq, int type)
{ {
struct mmp_tdma_chan *tdmac; struct mmp_tdma_chan *tdmac;
...@@ -515,7 +515,7 @@ static struct of_device_id mmp_tdma_dt_ids[] = { ...@@ -515,7 +515,7 @@ static struct of_device_id mmp_tdma_dt_ids[] = {
}; };
MODULE_DEVICE_TABLE(of, mmp_tdma_dt_ids); MODULE_DEVICE_TABLE(of, mmp_tdma_dt_ids);
static int __devinit mmp_tdma_probe(struct platform_device *pdev) static int mmp_tdma_probe(struct platform_device *pdev)
{ {
enum mmp_tdma_type type; enum mmp_tdma_type type;
const struct of_device_id *of_id; const struct of_device_id *of_id;
......
drivers/dma/mpc512x_dma.c
View file @ 463a1f8b
...@@ -641,7 +641,7 @@ mpc_dma_prep_memcpy(struct dma_chan *chan, dma_addr_t dst, dma_addr_t src, ...@@ -641,7 +641,7 @@ mpc_dma_prep_memcpy(struct dma_chan *chan, dma_addr_t dst, dma_addr_t src,
return &mdesc->desc; return &mdesc->desc;
} }
static int __devinit mpc_dma_probe(struct platform_device *op) static int mpc_dma_probe(struct platform_device *op)
{ {
struct device_node *dn = op->dev.of_node; struct device_node *dn = op->dev.of_node;
struct device *dev = &op->dev; struct device *dev = &op->dev;
......
drivers/dma/mv_xor.c
View file @ 463a1f8b
...@@ -901,7 +901,7 @@ static void mv_xor_issue_pending(struct dma_chan *chan) ...@@ -901,7 +901,7 @@ static void mv_xor_issue_pending(struct dma_chan *chan)
*/ */
#define MV_XOR_TEST_SIZE 2000 #define MV_XOR_TEST_SIZE 2000
static int __devinit mv_xor_memcpy_self_test(struct mv_xor_device *device) static int mv_xor_memcpy_self_test(struct mv_xor_device *device)
{ {
int i; int i;
void *src, *dest; void *src, *dest;
...@@ -975,7 +975,7 @@ static int __devinit mv_xor_memcpy_self_test(struct mv_xor_device *device) ...@@ -975,7 +975,7 @@ static int __devinit mv_xor_memcpy_self_test(struct mv_xor_device *device)
} }
#define MV_XOR_NUM_SRC_TEST 4 /* must be <= 15 */ #define MV_XOR_NUM_SRC_TEST 4 /* must be <= 15 */
static int __devinit static int
mv_xor_xor_self_test(struct mv_xor_device *device) mv_xor_xor_self_test(struct mv_xor_device *device)
{ {
int i, src_idx; int i, src_idx;
...@@ -1100,7 +1100,7 @@ static int __devexit mv_xor_remove(struct platform_device *dev) ...@@ -1100,7 +1100,7 @@ static int __devexit mv_xor_remove(struct platform_device *dev)
return 0; return 0;
} }
static int __devinit mv_xor_probe(struct platform_device *pdev) static int mv_xor_probe(struct platform_device *pdev)
{ {
int ret = 0; int ret = 0;
int irq; int irq;
......
drivers/dma/pch_dma.c
View file @ 463a1f8b
...@@ -843,7 +843,7 @@ static int pch_dma_resume(struct pci_dev *pdev) ...@@ -843,7 +843,7 @@ static int pch_dma_resume(struct pci_dev *pdev)
} }
#endif #endif
static int __devinit pch_dma_probe(struct pci_dev *pdev, static int pch_dma_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct pch_dma *pd; struct pch_dma *pd;
......
drivers/dma/pl330.c
View file @ 463a1f8b
...@@ -2851,7 +2851,7 @@ static irqreturn_t pl330_irq_handler(int irq, void *data) ...@@ -2851,7 +2851,7 @@ static irqreturn_t pl330_irq_handler(int irq, void *data)
return IRQ_NONE; return IRQ_NONE;
} }
static int __devinit static int
pl330_probe(struct amba_device *adev, const struct amba_id *id) pl330_probe(struct amba_device *adev, const struct amba_id *id)
{ {
struct dma_pl330_platdata *pdat; struct dma_pl330_platdata *pdat;
......
drivers/dma/ppc4xx/adma.c
View file @ 463a1f8b
...@@ -4361,7 +4361,7 @@ static void ppc440spe_adma_release_irqs(struct ppc440spe_adma_device *adev, ...@@ -4361,7 +4361,7 @@ static void ppc440spe_adma_release_irqs(struct ppc440spe_adma_device *adev,
/** /**
* ppc440spe_adma_probe - probe the asynch device * ppc440spe_adma_probe - probe the asynch device
*/ */
static int __devinit ppc440spe_adma_probe(struct platform_device *ofdev) static int ppc440spe_adma_probe(struct platform_device *ofdev)
{ {
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
struct resource res; struct resource res;
......
drivers/dma/sa11x0-dma.c
View file @ 463a1f8b
...@@ -826,7 +826,7 @@ static const struct sa11x0_dma_channel_desc chan_desc[] = { ...@@ -826,7 +826,7 @@ static const struct sa11x0_dma_channel_desc chan_desc[] = {
CD(Ser4SSPRc, DDAR_RW), CD(Ser4SSPRc, DDAR_RW),
}; };
static int __devinit sa11x0_dma_init_dmadev(struct dma_device *dmadev, static int sa11x0_dma_init_dmadev(struct dma_device *dmadev,
struct device *dev) struct device *dev)
{ {
unsigned i; unsigned i;
...@@ -891,7 +891,7 @@ static void sa11x0_dma_free_channels(struct dma_device *dmadev) ...@@ -891,7 +891,7 @@ static void sa11x0_dma_free_channels(struct dma_device *dmadev)
} }
} }
static int __devinit sa11x0_dma_probe(struct platform_device *pdev) static int sa11x0_dma_probe(struct platform_device *pdev)
{ {
struct sa11x0_dma_dev *d; struct sa11x0_dma_dev *d;
struct resource *res; struct resource *res;
......
drivers/dma/sh/shdma.c
View file @ 463a1f8b
...@@ -483,7 +483,7 @@ static struct notifier_block sh_dmae_nmi_notifier __read_mostly = { ...@@ -483,7 +483,7 @@ static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
.priority = 1, .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) int irq, unsigned long flags)
{ {
const struct sh_dmae_channel *chan_pdata = &shdev->pdata->channel[id]; 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,7 +646,7 @@ static const struct shdma_ops sh_dmae_shdma_ops = {
.get_partial = sh_dmae_get_partial, .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; struct sh_dmae_pdata *pdata = pdev->dev.platform_data;
unsigned long irqflags = IRQF_DISABLED, unsigned long irqflags = IRQF_DISABLED,
......
drivers/dma/sirf-dma.c
View file @ 463a1f8b
...@@ -550,7 +550,7 @@ bool sirfsoc_dma_filter_id(struct dma_chan *chan, void *chan_id) ...@@ -550,7 +550,7 @@ bool sirfsoc_dma_filter_id(struct dma_chan *chan, void *chan_id)
} }
EXPORT_SYMBOL(sirfsoc_dma_filter_id); EXPORT_SYMBOL(sirfsoc_dma_filter_id);
static int __devinit sirfsoc_dma_probe(struct platform_device *op) static int sirfsoc_dma_probe(struct platform_device *op)
{ {
struct device_node *dn = op->dev.of_node; struct device_node *dn = op->dev.of_node;
struct device *dev = &op->dev; struct device *dev = &op->dev;
......
drivers/dma/tegra20-apb-dma.c
View file @ 463a1f8b
...@@ -1197,7 +1197,7 @@ static const struct of_device_id tegra_dma_of_match[] __devinitconst = { ...@@ -1197,7 +1197,7 @@ static const struct of_device_id tegra_dma_of_match[] __devinitconst = {
MODULE_DEVICE_TABLE(of, tegra_dma_of_match); MODULE_DEVICE_TABLE(of, tegra_dma_of_match);
#endif #endif
static int __devinit tegra_dma_probe(struct platform_device *pdev) static int tegra_dma_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct tegra_dma *tdma; struct tegra_dma *tdma;
......
drivers/dma/timb_dma.c
View file @ 463a1f8b
...@@ -667,7 +667,7 @@ static irqreturn_t td_irq(int irq, void *devid) ...@@ -667,7 +667,7 @@ static irqreturn_t td_irq(int irq, void *devid)
} }
static int __devinit td_probe(struct platform_device *pdev) static int td_probe(struct platform_device *pdev)
{ {
struct timb_dma_platform_data *pdata = pdev->dev.platform_data; struct timb_dma_platform_data *pdata = pdev->dev.platform_data;
struct timb_dma *td; struct timb_dma *td;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7