Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Drivers: iommu: remove __dev* attributes.

Browse source 
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>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 15:05:21 -08:00
parent 6d2cea4fca
commit d34d6517ea
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/iommu/intel-iommu.c
View file

@ -4234,7 +4234,7 @@ static struct iommu_ops intel_iommu_ops = {
.pgsize_bitmap = INTEL_IOMMU_PGSIZES, .pgsize_bitmap = INTEL_IOMMU_PGSIZES,
}; };
static void __devinit quirk_iommu_rwbf(struct pci_dev *dev) static void quirk_iommu_rwbf(struct pci_dev *dev)
{ {
/* /*
* Mobile 4 Series Chipset neglects to set RWBF capability, * Mobile 4 Series Chipset neglects to set RWBF capability,
@ -4262,7 +4262,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);
#define GGC_MEMORY_SIZE_3M_VT (0xa << 8) #define GGC_MEMORY_SIZE_3M_VT (0xa << 8)
#define GGC_MEMORY_SIZE_4M_VT (0xb << 8) #define GGC_MEMORY_SIZE_4M_VT (0xb << 8)
static void __devinit quirk_calpella_no_shadow_gtt(struct pci_dev *dev) static void quirk_calpella_no_shadow_gtt(struct pci_dev *dev)
{ {
unsigned short ggc; unsigned short ggc;

6
drivers/iommu/omap-iommu.c
View file

@ -934,7 +934,7 @@ static void omap_iommu_detach(struct omap_iommu *obj)
/* /*
* OMAP Device MMU(IOMMU) detection * OMAP Device MMU(IOMMU) detection
*/ */
static int __devinit omap_iommu_probe(struct platform_device *pdev) static int omap_iommu_probe(struct platform_device *pdev)
{ {
int err = -ENODEV; int err = -ENODEV;
int irq; int irq;
@ -1003,7 +1003,7 @@ static int __devinit omap_iommu_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit omap_iommu_remove(struct platform_device *pdev) static int omap_iommu_remove(struct platform_device *pdev)
{ {
int irq; int irq;
struct resource *res; struct resource *res;
@ -1028,7 +1028,7 @@ static int __devexit omap_iommu_remove(struct platform_device *pdev)
static struct platform_driver omap_iommu_driver = { static struct platform_driver omap_iommu_driver = {
.probe = omap_iommu_probe, .probe = omap_iommu_probe,
.remove = __devexit_p(omap_iommu_remove), .remove = omap_iommu_remove,
.driver = { .driver = {
.name = "omap-iommu", .name = "omap-iommu",
}, },

4
drivers/iommu/tegra-gart.c
View file

@ -431,7 +431,7 @@ const struct dev_pm_ops tegra_gart_pm_ops = {
}; };
#ifdef CONFIG_OF #ifdef CONFIG_OF
static struct of_device_id tegra_gart_of_match[] __devinitdata = { static struct of_device_id tegra_gart_of_match[] = {
{ .compatible = "nvidia,tegra20-gart", }, { .compatible = "nvidia,tegra20-gart", },
{ }, { },
}; };
@ -449,7 +449,7 @@ static struct platform_driver tegra_gart_driver = {
}, },
}; };
static int __devinit tegra_gart_init(void) static int tegra_gart_init(void)
{ {
return platform_driver_register(&tegra_gart_driver); return platform_driver_register(&tegra_gart_driver);
} }

4
drivers/iommu/tegra-smmu.c
View file

@ -1255,7 +1255,7 @@ const struct dev_pm_ops tegra_smmu_pm_ops = {
}; };
#ifdef CONFIG_OF #ifdef CONFIG_OF
static struct of_device_id tegra_smmu_of_match[] __devinitdata = { static struct of_device_id tegra_smmu_of_match[] = {
{ .compatible = "nvidia,tegra30-smmu", }, { .compatible = "nvidia,tegra30-smmu", },
{ }, { },
}; };
@ -1273,7 +1273,7 @@ static struct platform_driver tegra_smmu_driver = {
}, },
}; };
static int __devinit tegra_smmu_init(void) static int tegra_smmu_init(void)
{ {
return platform_driver_register(&tegra_smmu_driver); return platform_driver_register(&tegra_smmu_driver);
} }