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

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

Drivers: char: 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,
__devinitconst, 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 Airlie <airlied@linux.ie>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1850514b

drivers/char/agp/ali-agp.c

+1 −2
Original line number Diff line number Diff line
@@ -299,8 +299,7 @@ static struct agp_device_ids ali_agp_device_ids[] = 
	{ }, /* dummy final entry, always present */

};



static int __devinit agp_ali_probe(struct pci_dev *pdev,

				const struct pci_device_id *ent)

static int agp_ali_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	struct agp_device_ids *devs = ali_agp_device_ids;

	struct agp_bridge_data *bridge;

drivers/char/agp/amd-k7-agp.c

+2 −2
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static struct agp_device_ids amd_agp_device_ids[] = 
	{ }, /* dummy final entry, always present */

};



static int __devinit agp_amdk7_probe(struct pci_dev *pdev,

static int agp_amdk7_probe(struct pci_dev *pdev,

			   const struct pci_device_id *ent)

{

	struct agp_bridge_data *bridge;

drivers/char/agp/amd64-agp.c

+7 −8
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static const struct agp_bridge_driver amd_8151_driver = { 
};



/* Some basic sanity checks for the aperture. */

static int __devinit agp_aperture_valid(u64 aper, u32 size)

static int agp_aperture_valid(u64 aper, u32 size)

{

	if (!aperture_valid(aper, size, 32*1024*1024))

		return 0;
@@ -267,8 +267,7 @@ static int __devinit agp_aperture_valid(u64 aper, u32 size) 
 * to allocate that much memory. But at least error out cleanly instead of

 * crashing.

 */

static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp,

								 u16 cap)

static int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, u16 cap)

{

	u32 aper_low, aper_hi;

	u64 aper, nb_aper;
@@ -326,7 +325,7 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, 
	return 0;

}



static __devinit int cache_nbs(struct pci_dev *pdev, u32 cap_ptr)

static int cache_nbs(struct pci_dev *pdev, u32 cap_ptr)

{

	int i;
@@ -352,7 +351,7 @@ static __devinit int cache_nbs(struct pci_dev *pdev, u32 cap_ptr) 
}



/* Handle AMD 8151 quirks */

static void __devinit amd8151_init(struct pci_dev *pdev, struct agp_bridge_data *bridge)

static void amd8151_init(struct pci_dev *pdev, struct agp_bridge_data *bridge)

{

	char *revstring;
@@ -390,7 +389,7 @@ static const struct aper_size_info_32 uli_sizes[7] = 
	{8, 2048, 1, 4},

	{4, 1024, 0, 3}

};

static int __devinit uli_agp_init(struct pci_dev *pdev)

static int uli_agp_init(struct pci_dev *pdev)

{

	u32 httfea,baseaddr,enuscr;

	struct pci_dev *dev1;
@@ -513,7 +512,7 @@ static int nforce3_agp_init(struct pci_dev *pdev) 
	return ret;

}



static int __devinit agp_amd64_probe(struct pci_dev *pdev,

static int agp_amd64_probe(struct pci_dev *pdev,

			   const struct pci_device_id *ent)

{

	struct agp_bridge_data *bridge;

drivers/char/agp/ati-agp.c

+1 −2
Original line number Diff line number Diff line
@@ -490,8 +490,7 @@ static struct agp_device_ids ati_agp_device_ids[] = 
	{ }, /* dummy final entry, always present */

};



static int __devinit agp_ati_probe(struct pci_dev *pdev,

				   const struct pci_device_id *ent)

static int agp_ati_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	struct agp_device_ids *devs = ati_agp_device_ids;

	struct agp_bridge_data *bridge;

drivers/char/agp/efficeon-agp.c

+2 −2
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static const struct agp_bridge_driver efficeon_driver = { 
	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,

};



static int __devinit agp_efficeon_probe(struct pci_dev *pdev,

static int agp_efficeon_probe(struct pci_dev *pdev,

			      const struct pci_device_id *ent)

{

	struct agp_bridge_data *bridge;