Skip to content

L
linux
Commit 4bf27b8b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Drivers: dma: remove __dev* attributes. 

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56550d94
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 51 deletions
drivers/dma/dw_dmac.c
View file @ 4bf27b8b
...@@ -1634,7 +1634,7 @@ static int dw_probe(struct platform_device *pdev) ...@@ -1634,7 +1634,7 @@ static int dw_probe(struct platform_device *pdev)
return 0; 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 *dw = platform_get_drvdata(pdev);
struct dw_dma_chan *dwc, *_dwc; struct dw_dma_chan *dwc, *_dwc;
......
drivers/dma/edma.c
View file @ 4bf27b8b
...@@ -585,7 +585,7 @@ static int edma_probe(struct platform_device *pdev) ...@@ -585,7 +585,7 @@ static int edma_probe(struct platform_device *pdev)
return ret; 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 device *dev = &pdev->dev;
struct edma_cc *ecc = dev_get_drvdata(dev); struct edma_cc *ecc = dev_get_drvdata(dev);
......
drivers/dma/intel_mid_dma.c
View file @ 4bf27b8b
...@@ -1308,7 +1308,7 @@ static int intel_mid_dma_probe(struct pci_dev *pdev, ...@@ -1308,7 +1308,7 @@ static int intel_mid_dma_probe(struct pci_dev *pdev,
* Free up all resources and data * Free up all resources and data
* Call shutdown_dma to complete contoller and chan cleanup * 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); struct middma_device *device = pci_get_drvdata(pdev);
......
drivers/dma/ioat/dca.c
View file @ 4bf27b8b
...@@ -242,8 +242,7 @@ static struct dca_ops ioat_dca_ops = { ...@@ -242,8 +242,7 @@ static struct dca_ops ioat_dca_ops = {
}; };
struct dca_provider * __devinit struct dca_provider *ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase)
ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase)
{ {
struct dca_provider *dca; struct dca_provider *dca;
struct ioat_dca_priv *ioatdca; struct ioat_dca_priv *ioatdca;
...@@ -408,8 +407,7 @@ static int ioat2_dca_count_dca_slots(void __iomem *iobase, u16 dca_offset) ...@@ -408,8 +407,7 @@ static int ioat2_dca_count_dca_slots(void __iomem *iobase, u16 dca_offset)
return slots; return slots;
} }
struct dca_provider * __devinit struct dca_provider *ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase)
ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase)
{ {
struct dca_provider *dca; struct dca_provider *dca;
struct ioat_dca_priv *ioatdca; struct ioat_dca_priv *ioatdca;
...@@ -621,8 +619,7 @@ static inline int dca3_tag_map_invalid(u8 *tag_map) ...@@ -621,8 +619,7 @@ static inline int dca3_tag_map_invalid(u8 *tag_map)
(tag_map[4] == DCA_TAG_MAP_VALID)); (tag_map[4] == DCA_TAG_MAP_VALID));
} }
struct dca_provider * __devinit struct dca_provider *ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase)
ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase)
{ {
struct dca_provider *dca; struct dca_provider *dca;
struct ioat_dca_priv *ioatdca; struct ioat_dca_priv *ioatdca;
......
drivers/dma/ioat/dma.c
View file @ 4bf27b8b
...@@ -782,7 +782,7 @@ static void ioat1_dma_start_null_desc(struct ioat_dma_chan *ioat) ...@@ -782,7 +782,7 @@ static void ioat1_dma_start_null_desc(struct ioat_dma_chan *ioat)
*/ */
#define IOAT_TEST_SIZE 2000 #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; struct completion *cmp = dma_async_param;
...@@ -793,7 +793,7 @@ static void __devinit ioat_dma_test_callback(void *dma_async_param) ...@@ -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. * ioat_dma_self_test - Perform a IOAT transaction to verify the HW works.
* @device: device to be tested * @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; int i;
u8 *src; u8 *src;
...@@ -994,7 +994,7 @@ static void ioat_disable_interrupts(struct ioatdma_device *device) ...@@ -994,7 +994,7 @@ static void ioat_disable_interrupts(struct ioatdma_device *device)
writeb(0, device->reg_base + IOAT_INTRCTRL_OFFSET); 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; int err = -ENODEV;
struct dma_device *dma = &device->common; struct dma_device *dma = &device->common;
...@@ -1049,7 +1049,7 @@ int __devinit ioat_probe(struct ioatdma_device *device) ...@@ -1049,7 +1049,7 @@ int __devinit ioat_probe(struct ioatdma_device *device)
return err; 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); int err = dma_async_device_register(&device->common);
...@@ -1183,7 +1183,7 @@ void ioat_kobject_del(struct ioatdma_device *device) ...@@ -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 pci_dev *pdev = device->pdev;
struct dma_device *dma; struct dma_device *dma;
...@@ -1216,7 +1216,7 @@ int __devinit ioat1_dma_probe(struct ioatdma_device *device, int dca) ...@@ -1216,7 +1216,7 @@ int __devinit ioat1_dma_probe(struct ioatdma_device *device, int dca)
return err; 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; struct dma_device *dma = &device->common;
......
drivers/dma/ioat/dma.h
View file @ 4bf27b8b
...@@ -303,13 +303,12 @@ static inline void ioat_unmap(struct pci_dev *pdev, dma_addr_t addr, size_t len, ...@@ -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); pci_unmap_page(pdev, addr, len, direction);
} }
int __devinit ioat_probe(struct ioatdma_device *device); int ioat_probe(struct ioatdma_device *device);
int __devinit ioat_register(struct ioatdma_device *device); int ioat_register(struct ioatdma_device *device);
int __devinit ioat1_dma_probe(struct ioatdma_device *dev, int dca); int ioat1_dma_probe(struct ioatdma_device *dev, int dca);
int __devinit ioat_dma_self_test(struct ioatdma_device *device); int ioat_dma_self_test(struct ioatdma_device *device);
void __devexit ioat_dma_remove(struct ioatdma_device *device); void ioat_dma_remove(struct ioatdma_device *device);
struct dca_provider * __devinit ioat_dca_init(struct pci_dev *pdev, struct dca_provider *ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase);
void __iomem *iobase);
dma_addr_t ioat_get_current_completion(struct ioat_chan_common *chan); dma_addr_t ioat_get_current_completion(struct ioat_chan_common *chan);
void ioat_init_channel(struct ioatdma_device *device, void ioat_init_channel(struct ioatdma_device *device,
struct ioat_chan_common *chan, int idx); struct ioat_chan_common *chan, int idx);
......
drivers/dma/ioat/dma_v2.c
View file @ 4bf27b8b
...@@ -862,7 +862,7 @@ struct kobj_type ioat2_ktype = { ...@@ -862,7 +862,7 @@ struct kobj_type ioat2_ktype = {
.default_attrs = ioat2_attrs, .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 pci_dev *pdev = device->pdev;
struct dma_device *dma; struct dma_device *dma;
......
drivers/dma/ioat/dma_v2.h
View file @ 4bf27b8b
...@@ -155,10 +155,10 @@ static inline void ioat2_set_chainaddr(struct ioat2_dma_chan *ioat, u64 addr) ...@@ -155,10 +155,10 @@ static inline void ioat2_set_chainaddr(struct ioat2_dma_chan *ioat, u64 addr)
chan->reg_base + IOAT2_CHAINADDR_OFFSET_HIGH); chan->reg_base + IOAT2_CHAINADDR_OFFSET_HIGH);
} }
int __devinit ioat2_dma_probe(struct ioatdma_device *dev, int dca); int ioat2_dma_probe(struct ioatdma_device *dev, int dca);
int __devinit ioat3_dma_probe(struct ioatdma_device *dev, int dca); int 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 *ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase);
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);
int ioat2_check_space_lock(struct ioat2_dma_chan *ioat, int num_descs); int ioat2_check_space_lock(struct ioat2_dma_chan *ioat, int num_descs);
int ioat2_enumerate_channels(struct ioatdma_device *device); int ioat2_enumerate_channels(struct ioatdma_device *device);
struct dma_async_tx_descriptor * struct dma_async_tx_descriptor *
......
drivers/dma/ioat/dma_v3.c
View file @ 4bf27b8b
...@@ -836,7 +836,7 @@ ioat3_prep_interrupt_lock(struct dma_chan *c, unsigned long flags) ...@@ -836,7 +836,7 @@ ioat3_prep_interrupt_lock(struct dma_chan *c, unsigned long flags)
return &desc->txd; 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; struct completion *cmp = dma_async_param;
...@@ -844,7 +844,7 @@ static void __devinit ioat3_dma_test_callback(void *dma_async_param) ...@@ -844,7 +844,7 @@ static void __devinit ioat3_dma_test_callback(void *dma_async_param)
} }
#define IOAT_NUM_SRC_TEST 6 /* must be <= 8 */ #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; int i, src_idx;
struct page *dest; struct page *dest;
...@@ -1096,7 +1096,7 @@ static int __devinit ioat_xor_val_self_test(struct ioatdma_device *device) ...@@ -1096,7 +1096,7 @@ static int __devinit ioat_xor_val_self_test(struct ioatdma_device *device)
return err; 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); int rc = ioat_dma_self_test(device);
...@@ -1187,7 +1187,7 @@ static bool is_snb_ioat(struct pci_dev *pdev) ...@@ -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; struct pci_dev *pdev = device->pdev;
int dca_en = system_has_dca_enabled(pdev); int dca_en = system_has_dca_enabled(pdev);
......
drivers/dma/ioat/pci.c
View file @ 4bf27b8b
...@@ -109,9 +109,8 @@ static struct pci_device_id ioat_pci_tbl[] = { ...@@ -109,9 +109,8 @@ static struct pci_device_id ioat_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, ioat_pci_tbl); MODULE_DEVICE_TABLE(pci, ioat_pci_tbl);
static int __devinit ioat_pci_probe(struct pci_dev *pdev, static int ioat_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id);
const struct pci_device_id *id); static void ioat_remove(struct pci_dev *pdev);
static void __devexit ioat_remove(struct pci_dev *pdev);
static int ioat_dca_enabled = 1; static int ioat_dca_enabled = 1;
module_param(ioat_dca_enabled, int, 0644); module_param(ioat_dca_enabled, int, 0644);
...@@ -141,7 +140,7 @@ alloc_ioatdma(struct pci_dev *pdev, void __iomem *iobase) ...@@ -141,7 +140,7 @@ alloc_ioatdma(struct pci_dev *pdev, void __iomem *iobase)
return d; 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; void __iomem * const *iomap;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
...@@ -195,7 +194,7 @@ static int __devinit ioat_pci_probe(struct pci_dev *pdev, const struct pci_devic ...@@ -195,7 +194,7 @@ static int __devinit ioat_pci_probe(struct pci_dev *pdev, const struct pci_devic
return 0; 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); struct ioatdma_device *device = pci_get_drvdata(pdev);
......
drivers/dma/iop-adma.c
View file @ 4bf27b8b
...@@ -1406,7 +1406,7 @@ iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device) ...@@ -1406,7 +1406,7 @@ iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device)
} }
#endif #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 iop_adma_device *device = platform_get_drvdata(dev);
struct dma_chan *chan, *_chan; struct dma_chan *chan, *_chan;
......
drivers/dma/mmp_pdma.c
View file @ 4bf27b8b
...@@ -712,7 +712,7 @@ static void dma_do_tasklet(unsigned long data) ...@@ -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); struct mmp_pdma_device *pdev = platform_get_drvdata(op);
......
drivers/dma/mmp_tdma.c
View file @ 4bf27b8b
...@@ -467,7 +467,7 @@ static void mmp_tdma_issue_pending(struct dma_chan *chan) ...@@ -467,7 +467,7 @@ static void mmp_tdma_issue_pending(struct dma_chan *chan)
mmp_tdma_enable_chan(tdmac); 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); struct mmp_tdma_device *tdev = platform_get_drvdata(pdev);
......
drivers/dma/mpc512x_dma.c
View file @ 4bf27b8b
...@@ -799,7 +799,7 @@ static int mpc_dma_probe(struct platform_device *op) ...@@ -799,7 +799,7 @@ static int mpc_dma_probe(struct platform_device *op)
return retval; 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 device *dev = &op->dev;
struct mpc_dma *mdma = dev_get_drvdata(dev); struct mpc_dma *mdma = dev_get_drvdata(dev);
......
drivers/dma/pch_dma.c
View file @ 4bf27b8b
...@@ -961,7 +961,7 @@ static int pch_dma_probe(struct pci_dev *pdev, ...@@ -961,7 +961,7 @@ static int pch_dma_probe(struct pci_dev *pdev,
return err; 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 *pd = pci_get_drvdata(pdev);
struct pch_dma_chan *pd_chan; struct pch_dma_chan *pd_chan;
......
drivers/dma/pl330.c
View file @ 4bf27b8b
...@@ -2988,7 +2988,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -2988,7 +2988,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
return ret; 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_dmac *pdmac = amba_get_drvdata(adev);
struct dma_pl330_chan *pch, *_p; struct dma_pl330_chan *pch, *_p;
......
drivers/dma/ppc4xx/adma.c
View file @ 4bf27b8b
...@@ -4592,7 +4592,7 @@ static int ppc440spe_adma_probe(struct platform_device *ofdev) ...@@ -4592,7 +4592,7 @@ static int ppc440spe_adma_probe(struct platform_device *ofdev)
/** /**
* ppc440spe_adma_remove - remove the asynch device * 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 ppc440spe_adma_device *adev = dev_get_drvdata(&ofdev->dev);
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
...@@ -4905,7 +4905,7 @@ static int ppc440spe_configure_raid_devices(void) ...@@ -4905,7 +4905,7 @@ static int ppc440spe_configure_raid_devices(void)
return ret; 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 = "ibm,dma-440spe", },
{ .compatible = "amcc,xor-accelerator", }, { .compatible = "amcc,xor-accelerator", },
{}, {},
......
drivers/dma/sa11x0-dma.c
View file @ 4bf27b8b
...@@ -967,7 +967,7 @@ static int sa11x0_dma_probe(struct platform_device *pdev) ...@@ -967,7 +967,7 @@ static int sa11x0_dma_probe(struct platform_device *pdev)
return ret; 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); struct sa11x0_dma_dev *d = platform_get_drvdata(pdev);
unsigned pch; unsigned pch;
......
drivers/dma/sh/shdma.c
View file @ 4bf27b8b
...@@ -880,7 +880,7 @@ static int sh_dmae_probe(struct platform_device *pdev) ...@@ -880,7 +880,7 @@ static int sh_dmae_probe(struct platform_device *pdev)
return err; 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 sh_dmae_device *shdev = platform_get_drvdata(pdev);
struct dma_device *dma_dev = &shdev->shdma_dev.dma_dev; struct dma_device *dma_dev = &shdev->shdma_dev.dma_dev;
......
drivers/dma/sirf-dma.c
View file @ 4bf27b8b
...@@ -655,7 +655,7 @@ static int sirfsoc_dma_probe(struct platform_device *op) ...@@ -655,7 +655,7 @@ static int sirfsoc_dma_probe(struct platform_device *op)
return ret; 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 device *dev = &op->dev;
struct sirfsoc_dma *sdma = dev_get_drvdata(dev); struct sirfsoc_dma *sdma = dev_get_drvdata(dev);
......
drivers/dma/tegra20-apb-dma.c
View file @ 4bf27b8b
...@@ -1184,7 +1184,7 @@ static const struct tegra_dma_chip_data tegra30_dma_chip_data = { ...@@ -1184,7 +1184,7 @@ static const struct tegra_dma_chip_data tegra30_dma_chip_data = {
.max_dma_count = 1024UL * 64, .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", .compatible = "nvidia,tegra30-apbdma",
.data = &tegra30_dma_chip_data, .data = &tegra30_dma_chip_data,
...@@ -1360,7 +1360,7 @@ static int tegra_dma_probe(struct platform_device *pdev) ...@@ -1360,7 +1360,7 @@ static int tegra_dma_probe(struct platform_device *pdev)
return ret; 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); struct tegra_dma *tdma = platform_get_drvdata(pdev);
int i; int i;
...@@ -1403,7 +1403,7 @@ static int tegra_dma_runtime_resume(struct device *dev) ...@@ -1403,7 +1403,7 @@ static int tegra_dma_runtime_resume(struct device *dev)
return 0; 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 #ifdef CONFIG_PM_RUNTIME
.runtime_suspend = tegra_dma_runtime_suspend, .runtime_suspend = tegra_dma_runtime_suspend,
.runtime_resume = tegra_dma_runtime_resume, .runtime_resume = tegra_dma_runtime_resume,
......
drivers/dma/timb_dma.c
View file @ 4bf27b8b
...@@ -798,7 +798,7 @@ static int td_probe(struct platform_device *pdev) ...@@ -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 timb_dma *td = platform_get_drvdata(pdev);
struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
......
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