Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ioat: ___devinit annotate the initialization paths

Mark all single use initialization routines with __devinit.

Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

+24 -20
+6 -3
drivers/dma/ioat/dca.c
··· 242 242 }; 243 243 244 244 245 - struct dca_provider *ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase) 245 + struct dca_provider * __devinit 246 + ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase) 246 247 { 247 248 struct dca_provider *dca; 248 249 struct ioat_dca_priv *ioatdca; ··· 408 407 return slots; 409 408 } 410 409 411 - struct dca_provider *ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase) 410 + struct dca_provider * __devinit 411 + ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase) 412 412 { 413 413 struct dca_provider *dca; 414 414 struct ioat_dca_priv *ioatdca; ··· 604 602 return slots; 605 603 } 606 604 607 - struct dca_provider *ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase) 605 + struct dca_provider * __devinit 606 + ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase) 608 607 { 609 608 struct dca_provider *dca; 610 609 struct ioat_dca_priv *ioatdca;
+6 -6
drivers/dma/ioat/dma.c
··· 870 870 */ 871 871 #define IOAT_TEST_SIZE 2000 872 872 873 - static void ioat_dma_test_callback(void *dma_async_param) 873 + static void __devinit ioat_dma_test_callback(void *dma_async_param) 874 874 { 875 875 struct completion *cmp = dma_async_param; 876 876 ··· 881 881 * ioat_dma_self_test - Perform a IOAT transaction to verify the HW works. 882 882 * @device: device to be tested 883 883 */ 884 - static int ioat_dma_self_test(struct ioatdma_device *device) 884 + static int __devinit ioat_dma_self_test(struct ioatdma_device *device) 885 885 { 886 886 int i; 887 887 u8 *src; ··· 1082 1082 writeb(0, device->reg_base + IOAT_INTRCTRL_OFFSET); 1083 1083 } 1084 1084 1085 - int ioat_probe(struct ioatdma_device *device) 1085 + int __devinit ioat_probe(struct ioatdma_device *device) 1086 1086 { 1087 1087 int err = -ENODEV; 1088 1088 struct dma_device *dma = &device->common; ··· 1142 1142 return err; 1143 1143 } 1144 1144 1145 - int ioat_register(struct ioatdma_device *device) 1145 + int __devinit ioat_register(struct ioatdma_device *device) 1146 1146 { 1147 1147 int err = dma_async_device_register(&device->common); 1148 1148 ··· 1169 1169 pci_write_config_dword(pdev, IOAT_PCI_DMACTRL_OFFSET, dmactrl); 1170 1170 } 1171 1171 1172 - int ioat1_dma_probe(struct ioatdma_device *device, int dca) 1172 + int __devinit ioat1_dma_probe(struct ioatdma_device *device, int dca) 1173 1173 { 1174 1174 struct pci_dev *pdev = device->pdev; 1175 1175 struct dma_device *dma; ··· 1200 1200 return err; 1201 1201 } 1202 1202 1203 - void ioat_dma_remove(struct ioatdma_device *device) 1203 + void __devexit ioat_dma_remove(struct ioatdma_device *device) 1204 1204 { 1205 1205 struct dma_device *dma = &device->common; 1206 1206
+6 -5
drivers/dma/ioat/dma.h
··· 217 217 return device->idx[index]; 218 218 } 219 219 220 - int ioat_probe(struct ioatdma_device *device); 221 - int ioat_register(struct ioatdma_device *device); 222 - int ioat1_dma_probe(struct ioatdma_device *dev, int dca); 223 - void ioat_dma_remove(struct ioatdma_device *device); 224 - struct dca_provider *ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase); 220 + int __devinit ioat_probe(struct ioatdma_device *device); 221 + int __devinit ioat_register(struct ioatdma_device *device); 222 + int __devinit ioat1_dma_probe(struct ioatdma_device *dev, int dca); 223 + void __devexit ioat_dma_remove(struct ioatdma_device *device); 224 + struct dca_provider * __devinit ioat_dca_init(struct pci_dev *pdev, 225 + void __iomem *iobase); 225 226 unsigned long ioat_get_current_completion(struct ioat_chan_common *chan); 226 227 void ioat_init_channel(struct ioatdma_device *device, 227 228 struct ioat_chan_common *chan, int idx,
+2 -2
drivers/dma/ioat/dma_v2.c
··· 683 683 return ioat_is_complete(c, cookie, done, used); 684 684 } 685 685 686 - int ioat2_dma_probe(struct ioatdma_device *device, int dca) 686 + int __devinit ioat2_dma_probe(struct ioatdma_device *device, int dca) 687 687 { 688 688 struct pci_dev *pdev = device->pdev; 689 689 struct dma_device *dma; ··· 722 722 return err; 723 723 } 724 724 725 - int ioat3_dma_probe(struct ioatdma_device *device, int dca) 725 + int __devinit ioat3_dma_probe(struct ioatdma_device *device, int dca) 726 726 { 727 727 struct pci_dev *pdev = device->pdev; 728 728 struct dma_device *dma;
+4 -4
drivers/dma/ioat/dma_v2.h
··· 127 127 return ioat->ring[idx & ioat2_ring_mask(ioat)]; 128 128 } 129 129 130 - int ioat2_dma_probe(struct ioatdma_device *dev, int dca); 131 - int ioat3_dma_probe(struct ioatdma_device *dev, int dca); 132 - struct dca_provider *ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase); 133 - struct dca_provider *ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase); 130 + int __devinit ioat2_dma_probe(struct ioatdma_device *dev, int dca); 131 + int __devinit ioat3_dma_probe(struct ioatdma_device *dev, int dca); 132 + struct dca_provider * __devinit ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase); 133 + struct dca_provider * __devinit ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase); 134 134 #endif /* IOATDMA_V2_H */