Commit d34d6517eadc91dc7915a2095c52dc8cde94db83
1 parent
6d2cea4fca
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
Drivers: iommu: 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, __devinitdata, 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: David Woodhouse <dwmw2@infradead.org> Cc: Joerg Roedel <joro@8bytes.org> Cc: Ohad Ben-Cohen <ohad@wizery.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Omar Ramirez Luna <omar.luna@linaro.org> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: Hiroshi Doyu <hdoyu@nvidia.com> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Bharat Nihalani <bnihalani@nvidia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Showing 4 changed files with 9 additions and 9 deletions Side-by-side Diff
drivers/iommu/intel-iommu.c
... | ... | @@ -4234,7 +4234,7 @@ |
4234 | 4234 | .pgsize_bitmap = INTEL_IOMMU_PGSIZES, |
4235 | 4235 | }; |
4236 | 4236 | |
4237 | -static void __devinit quirk_iommu_rwbf(struct pci_dev *dev) | |
4237 | +static void quirk_iommu_rwbf(struct pci_dev *dev) | |
4238 | 4238 | { |
4239 | 4239 | /* |
4240 | 4240 | * Mobile 4 Series Chipset neglects to set RWBF capability, |
... | ... | @@ -4262,7 +4262,7 @@ |
4262 | 4262 | #define GGC_MEMORY_SIZE_3M_VT (0xa << 8) |
4263 | 4263 | #define GGC_MEMORY_SIZE_4M_VT (0xb << 8) |
4264 | 4264 | |
4265 | -static void __devinit quirk_calpella_no_shadow_gtt(struct pci_dev *dev) | |
4265 | +static void quirk_calpella_no_shadow_gtt(struct pci_dev *dev) | |
4266 | 4266 | { |
4267 | 4267 | unsigned short ggc; |
4268 | 4268 |
drivers/iommu/omap-iommu.c
... | ... | @@ -934,7 +934,7 @@ |
934 | 934 | /* |
935 | 935 | * OMAP Device MMU(IOMMU) detection |
936 | 936 | */ |
937 | -static int __devinit omap_iommu_probe(struct platform_device *pdev) | |
937 | +static int omap_iommu_probe(struct platform_device *pdev) | |
938 | 938 | { |
939 | 939 | int err = -ENODEV; |
940 | 940 | int irq; |
... | ... | @@ -1003,7 +1003,7 @@ |
1003 | 1003 | return err; |
1004 | 1004 | } |
1005 | 1005 | |
1006 | -static int __devexit omap_iommu_remove(struct platform_device *pdev) | |
1006 | +static int omap_iommu_remove(struct platform_device *pdev) | |
1007 | 1007 | { |
1008 | 1008 | int irq; |
1009 | 1009 | struct resource *res; |
... | ... | @@ -1028,7 +1028,7 @@ |
1028 | 1028 | |
1029 | 1029 | static struct platform_driver omap_iommu_driver = { |
1030 | 1030 | .probe = omap_iommu_probe, |
1031 | - .remove = __devexit_p(omap_iommu_remove), | |
1031 | + .remove = omap_iommu_remove, | |
1032 | 1032 | .driver = { |
1033 | 1033 | .name = "omap-iommu", |
1034 | 1034 | }, |
drivers/iommu/tegra-gart.c
... | ... | @@ -431,7 +431,7 @@ |
431 | 431 | }; |
432 | 432 | |
433 | 433 | #ifdef CONFIG_OF |
434 | -static struct of_device_id tegra_gart_of_match[] __devinitdata = { | |
434 | +static struct of_device_id tegra_gart_of_match[] = { | |
435 | 435 | { .compatible = "nvidia,tegra20-gart", }, |
436 | 436 | { }, |
437 | 437 | }; |
... | ... | @@ -449,7 +449,7 @@ |
449 | 449 | }, |
450 | 450 | }; |
451 | 451 | |
452 | -static int __devinit tegra_gart_init(void) | |
452 | +static int tegra_gart_init(void) | |
453 | 453 | { |
454 | 454 | return platform_driver_register(&tegra_gart_driver); |
455 | 455 | } |
drivers/iommu/tegra-smmu.c
... | ... | @@ -1255,7 +1255,7 @@ |
1255 | 1255 | }; |
1256 | 1256 | |
1257 | 1257 | #ifdef CONFIG_OF |
1258 | -static struct of_device_id tegra_smmu_of_match[] __devinitdata = { | |
1258 | +static struct of_device_id tegra_smmu_of_match[] = { | |
1259 | 1259 | { .compatible = "nvidia,tegra30-smmu", }, |
1260 | 1260 | { }, |
1261 | 1261 | }; |
... | ... | @@ -1273,7 +1273,7 @@ |
1273 | 1273 | }, |
1274 | 1274 | }; |
1275 | 1275 | |
1276 | -static int __devinit tegra_smmu_init(void) | |
1276 | +static int tegra_smmu_init(void) | |
1277 | 1277 | { |
1278 | 1278 | return platform_driver_register(&tegra_smmu_driver); |
1279 | 1279 | } |