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

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

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6d2cea4f

drivers/iommu/intel-iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -4234,7 +4234,7 @@ static struct iommu_ops intel_iommu_ops = { 
	.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,
@@ -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_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;

drivers/iommu/omap-iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ static void omap_iommu_detach(struct omap_iommu *obj) 
/*

 *	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 irq;
@@ -1003,7 +1003,7 @@ static int __devinit omap_iommu_probe(struct platform_device *pdev) 
	return err;

}



static int __devexit omap_iommu_remove(struct platform_device *pdev)

static int omap_iommu_remove(struct platform_device *pdev)

{

	int irq;

	struct resource *res;
@@ -1028,7 +1028,7 @@ static int __devexit omap_iommu_remove(struct platform_device *pdev) 


static struct platform_driver omap_iommu_driver = {

	.probe	= omap_iommu_probe,

	.remove	= __devexit_p(omap_iommu_remove),

	.remove	= omap_iommu_remove,

	.driver	= {

		.name	= "omap-iommu",

	},

drivers/iommu/tegra-gart.c

+2 −2
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ const struct dev_pm_ops tegra_gart_pm_ops = { 
};



#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", },

	{ },

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

}

drivers/iommu/tegra-smmu.c

+2 −2
Original line number Diff line number Diff line
@@ -1255,7 +1255,7 @@ const struct dev_pm_ops tegra_smmu_pm_ops = { 
};



#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", },

	{ },

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

}