Skip to content

Commit

Permalink
Drivers: dma: remove __dev* attributes.
Browse files Browse the repository at this point in the history 
CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitconst,
and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Viresh Kumar <viresh.linux@gmail.com>
Cc: Dan Williams <djbw@fb.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Barry Song <baohua.song@csr.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@intel.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Jassi Brar <jassisinghbrar@gmail.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Jan 3, 2013
1 parent 56550d9 commit 4bf27b8
Show file tree
Hide file tree
Showing 22 changed files with 46 additions and 51 deletions.
2 changes: 1 addition & 1 deletion drivers/dma/dw_dmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1634,7 +1634,7 @@ static int dw_probe(struct platform_device *pdev)
return 0;
}

static int __devexit dw_remove(struct platform_device *pdev)
static int dw_remove(struct platform_device *pdev)
{
struct dw_dma *dw = platform_get_drvdata(pdev);
struct dw_dma_chan *dwc, *_dwc;
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/edma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ static int edma_probe(struct platform_device *pdev)
return ret;
}

static int __devexit edma_remove(struct platform_device *pdev)
static int edma_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct edma_cc *ecc = dev_get_drvdata(dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/intel_mid_dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1308,7 +1308,7 @@ static int intel_mid_dma_probe(struct pci_dev *pdev,
* Free up all resources and data
* Call shutdown_dma to complete contoller and chan cleanup
*/
static void __devexit intel_mid_dma_remove(struct pci_dev *pdev)
static void intel_mid_dma_remove(struct pci_dev *pdev)
{
struct middma_device *device = pci_get_drvdata(pdev);

Expand Down
9 changes: 3 additions & 6 deletions drivers/dma/ioat/dca.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,7 @@ static struct dca_ops ioat_dca_ops = {
};


struct dca_provider * __devinit
ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase)
struct dca_provider *ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase)
{
struct dca_provider *dca;
struct ioat_dca_priv *ioatdca;
Expand Down Expand Up @@ -408,8 +407,7 @@ static int ioat2_dca_count_dca_slots(void __iomem *iobase, u16 dca_offset)
return slots;
}

struct dca_provider * __devinit
ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase)
struct dca_provider *ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase)
{
struct dca_provider *dca;
struct ioat_dca_priv *ioatdca;
Expand Down Expand Up @@ -621,8 +619,7 @@ static inline int dca3_tag_map_invalid(u8 *tag_map)
(tag_map[4] == DCA_TAG_MAP_VALID));
}

struct dca_provider * __devinit
ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase)
struct dca_provider *ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase)
{
struct dca_provider *dca;
struct ioat_dca_priv *ioatdca;
Expand Down
12 changes: 6 additions & 6 deletions drivers/dma/ioat/dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ static void ioat1_dma_start_null_desc(struct ioat_dma_chan *ioat)
*/
#define IOAT_TEST_SIZE 2000

static void __devinit ioat_dma_test_callback(void *dma_async_param)
static void ioat_dma_test_callback(void *dma_async_param)
{
struct completion *cmp = dma_async_param;

Expand All @@ -793,7 +793,7 @@ static void __devinit ioat_dma_test_callback(void *dma_async_param)
* ioat_dma_self_test - Perform a IOAT transaction to verify the HW works.
* @device: device to be tested
*/
int __devinit ioat_dma_self_test(struct ioatdma_device *device)
int ioat_dma_self_test(struct ioatdma_device *device)
{
int i;
u8 *src;
Expand Down Expand Up @@ -994,7 +994,7 @@ static void ioat_disable_interrupts(struct ioatdma_device *device)
writeb(0, device->reg_base + IOAT_INTRCTRL_OFFSET);
}

int __devinit ioat_probe(struct ioatdma_device *device)
int ioat_probe(struct ioatdma_device *device)
{
int err = -ENODEV;
struct dma_device *dma = &device->common;
Expand Down Expand Up @@ -1049,7 +1049,7 @@ int __devinit ioat_probe(struct ioatdma_device *device)
return err;
}

int __devinit ioat_register(struct ioatdma_device *device)
int ioat_register(struct ioatdma_device *device)
{
int err = dma_async_device_register(&device->common);

Expand Down Expand Up @@ -1183,7 +1183,7 @@ void ioat_kobject_del(struct ioatdma_device *device)
}
}

int __devinit ioat1_dma_probe(struct ioatdma_device *device, int dca)
int ioat1_dma_probe(struct ioatdma_device *device, int dca)
{
struct pci_dev *pdev = device->pdev;
struct dma_device *dma;
Expand Down Expand Up @@ -1216,7 +1216,7 @@ int __devinit ioat1_dma_probe(struct ioatdma_device *device, int dca)
return err;
}

void __devexit ioat_dma_remove(struct ioatdma_device *device)
void ioat_dma_remove(struct ioatdma_device *device)
{
struct dma_device *dma = &device->common;

Expand Down
13 changes: 6 additions & 7 deletions drivers/dma/ioat/dma.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,13 +303,12 @@ static inline void ioat_unmap(struct pci_dev *pdev, dma_addr_t addr, size_t len,
pci_unmap_page(pdev, addr, len, direction);
}

int __devinit ioat_probe(struct ioatdma_device *device);
int __devinit ioat_register(struct ioatdma_device *device);
int __devinit ioat1_dma_probe(struct ioatdma_device *dev, int dca);
int __devinit ioat_dma_self_test(struct ioatdma_device *device);
void __devexit ioat_dma_remove(struct ioatdma_device *device);
struct dca_provider * __devinit ioat_dca_init(struct pci_dev *pdev,
void __iomem *iobase);
int ioat_probe(struct ioatdma_device *device);
int ioat_register(struct ioatdma_device *device);
int ioat1_dma_probe(struct ioatdma_device *dev, int dca);
int ioat_dma_self_test(struct ioatdma_device *device);
void ioat_dma_remove(struct ioatdma_device *device);
struct dca_provider *ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase);
dma_addr_t ioat_get_current_completion(struct ioat_chan_common *chan);
void ioat_init_channel(struct ioatdma_device *device,
struct ioat_chan_common *chan, int idx);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/ioat/dma_v2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@ struct kobj_type ioat2_ktype = {
.default_attrs = ioat2_attrs,
};

int __devinit ioat2_dma_probe(struct ioatdma_device *device, int dca)
int ioat2_dma_probe(struct ioatdma_device *device, int dca)
{
struct pci_dev *pdev = device->pdev;
struct dma_device *dma;
Expand Down
8 changes: 4 additions & 4 deletions drivers/dma/ioat/dma_v2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@ static inline void ioat2_set_chainaddr(struct ioat2_dma_chan *ioat, u64 addr)
chan->reg_base + IOAT2_CHAINADDR_OFFSET_HIGH);
}

int __devinit ioat2_dma_probe(struct ioatdma_device *dev, int dca);
int __devinit ioat3_dma_probe(struct ioatdma_device *dev, int dca);
struct dca_provider * __devinit ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase);
struct dca_provider * __devinit ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase);
int ioat2_dma_probe(struct ioatdma_device *dev, int dca);
int ioat3_dma_probe(struct ioatdma_device *dev, int dca);
struct dca_provider *ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase);
struct dca_provider *ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase);
int ioat2_check_space_lock(struct ioat2_dma_chan *ioat, int num_descs);
int ioat2_enumerate_channels(struct ioatdma_device *device);
struct dma_async_tx_descriptor *
Expand Down
8 changes: 4 additions & 4 deletions drivers/dma/ioat/dma_v3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,15 +836,15 @@ ioat3_prep_interrupt_lock(struct dma_chan *c, unsigned long flags)
return &desc->txd;
}

static void __devinit ioat3_dma_test_callback(void *dma_async_param)
static void ioat3_dma_test_callback(void *dma_async_param)
{
struct completion *cmp = dma_async_param;

complete(cmp);
}

#define IOAT_NUM_SRC_TEST 6 /* must be <= 8 */
static int __devinit ioat_xor_val_self_test(struct ioatdma_device *device)
static int ioat_xor_val_self_test(struct ioatdma_device *device)
{
int i, src_idx;
struct page *dest;
Expand Down Expand Up @@ -1096,7 +1096,7 @@ static int __devinit ioat_xor_val_self_test(struct ioatdma_device *device)
return err;
}

static int __devinit ioat3_dma_self_test(struct ioatdma_device *device)
static int ioat3_dma_self_test(struct ioatdma_device *device)
{
int rc = ioat_dma_self_test(device);

Expand Down Expand Up @@ -1187,7 +1187,7 @@ static bool is_snb_ioat(struct pci_dev *pdev)
}
}

int __devinit ioat3_dma_probe(struct ioatdma_device *device, int dca)
int ioat3_dma_probe(struct ioatdma_device *device, int dca)
{
struct pci_dev *pdev = device->pdev;
int dca_en = system_has_dca_enabled(pdev);
Expand Down
9 changes: 4 additions & 5 deletions drivers/dma/ioat/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,8 @@ static struct pci_device_id ioat_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, ioat_pci_tbl);

static int __devinit ioat_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id);
static void __devexit ioat_remove(struct pci_dev *pdev);
static int ioat_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id);
static void ioat_remove(struct pci_dev *pdev);

static int ioat_dca_enabled = 1;
module_param(ioat_dca_enabled, int, 0644);
Expand Down Expand Up @@ -141,7 +140,7 @@ alloc_ioatdma(struct pci_dev *pdev, void __iomem *iobase)
return d;
}

static int __devinit ioat_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
static int ioat_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
void __iomem * const *iomap;
struct device *dev = &pdev->dev;
Expand Down Expand Up @@ -195,7 +194,7 @@ static int __devinit ioat_pci_probe(struct pci_dev *pdev, const struct pci_devic
return 0;
}

static void __devexit ioat_remove(struct pci_dev *pdev)
static void ioat_remove(struct pci_dev *pdev)
{
struct ioatdma_device *device = pci_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/iop-adma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1406,7 +1406,7 @@ iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device)
}
#endif

static int __devexit iop_adma_remove(struct platform_device *dev)
static int iop_adma_remove(struct platform_device *dev)
{
struct iop_adma_device *device = platform_get_drvdata(dev);
struct dma_chan *chan, *_chan;
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/mmp_pdma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ static void dma_do_tasklet(unsigned long data)
}
}

static int __devexit mmp_pdma_remove(struct platform_device *op)
static int mmp_pdma_remove(struct platform_device *op)
{
struct mmp_pdma_device *pdev = platform_get_drvdata(op);

Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/mmp_tdma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ static void mmp_tdma_issue_pending(struct dma_chan *chan)
mmp_tdma_enable_chan(tdmac);
}

static int __devexit mmp_tdma_remove(struct platform_device *pdev)
static int mmp_tdma_remove(struct platform_device *pdev)
{
struct mmp_tdma_device *tdev = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/mpc512x_dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ static int mpc_dma_probe(struct platform_device *op)
return retval;
}

static int __devexit mpc_dma_remove(struct platform_device *op)
static int mpc_dma_remove(struct platform_device *op)
{
struct device *dev = &op->dev;
struct mpc_dma *mdma = dev_get_drvdata(dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/pch_dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ static int pch_dma_probe(struct pci_dev *pdev,
return err;
}

static void __devexit pch_dma_remove(struct pci_dev *pdev)
static void pch_dma_remove(struct pci_dev *pdev)
{
struct pch_dma *pd = pci_get_drvdata(pdev);
struct pch_dma_chan *pd_chan;
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/pl330.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2988,7 +2988,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
return ret;
}

static int __devexit pl330_remove(struct amba_device *adev)
static int pl330_remove(struct amba_device *adev)
{
struct dma_pl330_dmac *pdmac = amba_get_drvdata(adev);
struct dma_pl330_chan *pch, *_p;
Expand Down
4 changes: 2 additions & 2 deletions drivers/dma/ppc4xx/adma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4592,7 +4592,7 @@ static int ppc440spe_adma_probe(struct platform_device *ofdev)
/**
* ppc440spe_adma_remove - remove the asynch device
*/
static int __devexit ppc440spe_adma_remove(struct platform_device *ofdev)
static int ppc440spe_adma_remove(struct platform_device *ofdev)
{
struct ppc440spe_adma_device *adev = dev_get_drvdata(&ofdev->dev);
struct device_node *np = ofdev->dev.of_node;
Expand Down Expand Up @@ -4905,7 +4905,7 @@ static int ppc440spe_configure_raid_devices(void)
return ret;
}

static const struct of_device_id ppc440spe_adma_of_match[] __devinitconst = {
static const struct of_device_id ppc440spe_adma_of_match[] = {
{ .compatible = "ibm,dma-440spe", },
{ .compatible = "amcc,xor-accelerator", },
{},
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/sa11x0-dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ static int sa11x0_dma_probe(struct platform_device *pdev)
return ret;
}

static int __devexit sa11x0_dma_remove(struct platform_device *pdev)
static int sa11x0_dma_remove(struct platform_device *pdev)
{
struct sa11x0_dma_dev *d = platform_get_drvdata(pdev);
unsigned pch;
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/sh/shdma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ static int sh_dmae_probe(struct platform_device *pdev)
return err;
}

static int __devexit sh_dmae_remove(struct platform_device *pdev)
static int sh_dmae_remove(struct platform_device *pdev)
{
struct sh_dmae_device *shdev = platform_get_drvdata(pdev);
struct dma_device *dma_dev = &shdev->shdma_dev.dma_dev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/sirf-dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ static int sirfsoc_dma_probe(struct platform_device *op)
return ret;
}

static int __devexit sirfsoc_dma_remove(struct platform_device *op)
static int sirfsoc_dma_remove(struct platform_device *op)
{
struct device *dev = &op->dev;
struct sirfsoc_dma *sdma = dev_get_drvdata(dev);
Expand Down
6 changes: 3 additions & 3 deletions drivers/dma/tegra20-apb-dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1184,7 +1184,7 @@ static const struct tegra_dma_chip_data tegra30_dma_chip_data = {
.max_dma_count = 1024UL * 64,
};

static const struct of_device_id tegra_dma_of_match[] __devinitconst = {
static const struct of_device_id tegra_dma_of_match[] = {
{
.compatible = "nvidia,tegra30-apbdma",
.data = &tegra30_dma_chip_data,
Expand Down Expand Up @@ -1360,7 +1360,7 @@ static int tegra_dma_probe(struct platform_device *pdev)
return ret;
}

static int __devexit tegra_dma_remove(struct platform_device *pdev)
static int tegra_dma_remove(struct platform_device *pdev)
{
struct tegra_dma *tdma = platform_get_drvdata(pdev);
int i;
Expand Down Expand Up @@ -1403,7 +1403,7 @@ static int tegra_dma_runtime_resume(struct device *dev)
return 0;
}

static const struct dev_pm_ops tegra_dma_dev_pm_ops __devinitconst = {
static const struct dev_pm_ops tegra_dma_dev_pm_ops = {
#ifdef CONFIG_PM_RUNTIME
.runtime_suspend = tegra_dma_runtime_suspend,
.runtime_resume = tegra_dma_runtime_resume,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/timb_dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ static int td_probe(struct platform_device *pdev)

}

static int __devexit td_remove(struct platform_device *pdev)
static int td_remove(struct platform_device *pdev)
{
struct timb_dma *td = platform_get_drvdata(pdev);
struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Expand Down

0 comments on commit 4bf27b8

Please sign in to comment.