Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/dma/dw_dmac.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/dma/edma.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/dma/intel_mid_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/dma/ioat/dca.c

+3 −6
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -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;

drivers/dma/ioat/dma.c

+6 −6
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -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;
@@ -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);
@@ -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;
@@ -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;