Commit 345d8523 authored by Dan Williams's avatar Dan Williams
Browse files

ioat: ___devinit annotate the initialization paths 



Mark all single use initialization routines with __devinit.

Signed-off-by: default avatarMaciej Sosnowski <maciej.sosnowski@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent f6ab95b5

drivers/dma/ioat/dca.c

+6 −3
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ static struct dca_ops ioat_dca_ops = { 
};





struct dca_provider *ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase)

struct dca_provider * __devinit

ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase)

{

	struct dca_provider *dca;

	struct ioat_dca_priv *ioatdca;
@@ -407,7 +408,8 @@ static int ioat2_dca_count_dca_slots(void __iomem *iobase, u16 dca_offset) 
	return slots;

}



struct dca_provider *ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase)

struct dca_provider * __devinit

ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase)

{

	struct dca_provider *dca;

	struct ioat_dca_priv *ioatdca;
@@ -602,7 +604,8 @@ static int ioat3_dca_count_dca_slots(void *iobase, u16 dca_offset) 
	return slots;

}



struct dca_provider *ioat3_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 *dca;

	struct ioat_dca_priv *ioatdca;

drivers/dma/ioat/dma.c

+6 −6
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ static void ioat1_dma_start_null_desc(struct ioat_dma_chan *ioat) 
 */

#define IOAT_TEST_SIZE 2000



static void ioat_dma_test_callback(void *dma_async_param)

static void __devinit ioat_dma_test_callback(void *dma_async_param)

{

	struct completion *cmp = dma_async_param;
@@ -881,7 +881,7 @@ static void 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

 */

static int ioat_dma_self_test(struct ioatdma_device *device)

static int __devinit ioat_dma_self_test(struct ioatdma_device *device)

{

	int i;

	u8 *src;
@@ -1082,7 +1082,7 @@ static void ioat_disable_interrupts(struct ioatdma_device *device) 
	writeb(0, device->reg_base + IOAT_INTRCTRL_OFFSET);

}



int ioat_probe(struct ioatdma_device *device)

int __devinit ioat_probe(struct ioatdma_device *device)

{

	int err = -ENODEV;

	struct dma_device *dma = &device->common;
@@ -1142,7 +1142,7 @@ int ioat_probe(struct ioatdma_device *device) 
	return err;

}



int ioat_register(struct ioatdma_device *device)

int __devinit ioat_register(struct ioatdma_device *device)

{

	int err = dma_async_device_register(&device->common);
@@ -1169,7 +1169,7 @@ static void ioat1_intr_quirk(struct ioatdma_device *device) 
	pci_write_config_dword(pdev, IOAT_PCI_DMACTRL_OFFSET, dmactrl);

}



int ioat1_dma_probe(struct ioatdma_device *device, int dca)

int __devinit ioat1_dma_probe(struct ioatdma_device *device, int dca)

{

	struct pci_dev *pdev = device->pdev;

	struct dma_device *dma;
@@ -1200,7 +1200,7 @@ int ioat1_dma_probe(struct ioatdma_device *device, int dca) 
	return err;

}



void ioat_dma_remove(struct ioatdma_device *device)

void __devexit ioat_dma_remove(struct ioatdma_device *device)

{

	struct dma_device *dma = &device->common;

drivers/dma/ioat/dma.h

+6 −5
Original line number Diff line number Diff line
@@ -217,11 +217,12 @@ ioat_chan_by_index(struct ioatdma_device *device, int index) 
	return device->idx[index];

}



int ioat_probe(struct ioatdma_device *device);

int ioat_register(struct ioatdma_device *device);

int ioat1_dma_probe(struct ioatdma_device *dev, int dca);

void ioat_dma_remove(struct ioatdma_device *device);

struct dca_provider *ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase);

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);

void __devexit ioat_dma_remove(struct ioatdma_device *device);

struct dca_provider * __devinit ioat_dca_init(struct pci_dev *pdev,

					      void __iomem *iobase);

unsigned long ioat_get_current_completion(struct ioat_chan_common *chan);

void ioat_init_channel(struct ioatdma_device *device,

		       struct ioat_chan_common *chan, int idx,

drivers/dma/ioat/dma_v2.c

+2 −2
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ ioat2_is_complete(struct dma_chan *c, dma_cookie_t cookie, 
	return ioat_is_complete(c, cookie, done, used);

}



int ioat2_dma_probe(struct ioatdma_device *device, int dca)

int __devinit ioat2_dma_probe(struct ioatdma_device *device, int dca)

{

	struct pci_dev *pdev = device->pdev;

	struct dma_device *dma;
@@ -722,7 +722,7 @@ int ioat2_dma_probe(struct ioatdma_device *device, int dca) 
	return err;

}



int ioat3_dma_probe(struct ioatdma_device *device, int dca)

int __devinit ioat3_dma_probe(struct ioatdma_device *device, int dca)

{

	struct pci_dev *pdev = device->pdev;

	struct dma_device *dma;

drivers/dma/ioat/dma_v2.h

+4 −4
Original line number Diff line number Diff line
@@ -127,8 +127,8 @@ ioat2_get_ring_ent(struct ioat2_dma_chan *ioat, u16 idx) 
	return ioat->ring[idx & ioat2_ring_mask(ioat)];

}



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 __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);

#endif /* IOATDMA_V2_H */