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

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

Drivers: edac: 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, 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: Doug Thompson <dougthompson@xmission.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Mark Gross <mark.gross@intel.com>
Cc: Jason Uhlenkott <juhlenko@akamai.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Tim Small <tim@buttersideup.com>
Cc: Ranganathan Desikan <ravi@jetztechnologies.com>
Cc: "Arvind R." <arvino55@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Daney <david.daney@cavium.com>
Cc: Egor Martovetsky <egor@pasemi.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 312facaf

drivers/edac/amd64_edac.c

+4 −4
Original line number Diff line number Diff line
@@ -2563,7 +2563,7 @@ static int amd64_init_one_instance(struct pci_dev *F2) 
	return ret;

}



static int __devinit amd64_probe_one_instance(struct pci_dev *pdev,

static int amd64_probe_one_instance(struct pci_dev *pdev,

				    const struct pci_device_id *mc_type)

{

	u8 nid = get_node_id(pdev);
@@ -2612,7 +2612,7 @@ static int __devinit amd64_probe_one_instance(struct pci_dev *pdev, 
	return ret;

}



static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)

static void amd64_remove_one_instance(struct pci_dev *pdev)

{

	struct mem_ctl_info *mci;

	struct amd64_pvt *pvt;
@@ -2686,7 +2686,7 @@ MODULE_DEVICE_TABLE(pci, amd64_pci_table); 
static struct pci_driver amd64_pci_driver = {

	.name		= EDAC_MOD_STR,

	.probe		= amd64_probe_one_instance,

	.remove		= __devexit_p(amd64_remove_one_instance),

	.remove		= amd64_remove_one_instance,

	.id_table	= amd64_pci_table,

};

drivers/edac/amd76x_edac.c

+4 −4
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) 
}



/* returns count (>= 0), or negative on error */

static int __devinit amd76x_init_one(struct pci_dev *pdev,

static int amd76x_init_one(struct pci_dev *pdev,

			   const struct pci_device_id *ent)

{

	edac_dbg(0, "\n");
@@ -318,7 +318,7 @@ static int __devinit amd76x_init_one(struct pci_dev *pdev, 
 *	structure for the device then delete the mci and free the

 *	resources.

 */

static void __devexit amd76x_remove_one(struct pci_dev *pdev)

static void amd76x_remove_one(struct pci_dev *pdev)

{

	struct mem_ctl_info *mci;
@@ -350,7 +350,7 @@ MODULE_DEVICE_TABLE(pci, amd76x_pci_tbl); 
static struct pci_driver amd76x_driver = {

	.name = EDAC_MOD_STR,

	.probe = amd76x_init_one,

	.remove = __devexit_p(amd76x_remove_one),

	.remove = amd76x_remove_one,

	.id_table = amd76x_pci_tbl,

};

drivers/edac/cell_edac.c

+4 −4
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void cell_edac_check(struct mem_ctl_info *mci) 
	}

}



static void __devinit cell_edac_init_csrows(struct mem_ctl_info *mci)

static void cell_edac_init_csrows(struct mem_ctl_info *mci)

{

	struct csrow_info		*csrow = mci->csrows[0];

	struct dimm_info		*dimm;
@@ -164,7 +164,7 @@ static void __devinit cell_edac_init_csrows(struct mem_ctl_info *mci) 
	}

}



static int __devinit cell_edac_probe(struct platform_device *pdev)

static int cell_edac_probe(struct platform_device *pdev)

{

	struct cbe_mic_tm_regs __iomem	*regs;

	struct mem_ctl_info		*mci;
@@ -233,7 +233,7 @@ static int __devinit cell_edac_probe(struct platform_device *pdev) 
	return 0;

}



static int __devexit cell_edac_remove(struct platform_device *pdev)

static int cell_edac_remove(struct platform_device *pdev)

{

	struct mem_ctl_info *mci = edac_mc_del_mc(&pdev->dev);

	if (mci)
@@ -247,7 +247,7 @@ static struct platform_driver cell_edac_driver = { 
		.owner	= THIS_MODULE,

	},

	.probe		= cell_edac_probe,

	.remove		= __devexit_p(cell_edac_remove),

	.remove		= cell_edac_remove,

};



static int __init cell_edac_init(void)

drivers/edac/cpc925_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static int cpc925_mc_get_channels(void __iomem *vbase) 
	return dual;

}



static int __devinit cpc925_probe(struct platform_device *pdev)

static int cpc925_probe(struct platform_device *pdev)

{

	static int edac_mc_idx;

	struct mem_ctl_info *mci;

drivers/edac/e752x_edac.c

+3 −4
Original line number Diff line number Diff line
@@ -1390,8 +1390,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) 
}



/* returns count (>= 0), or negative on error */

static int __devinit e752x_init_one(struct pci_dev *pdev,

				const struct pci_device_id *ent)

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

{

	edac_dbg(0, "\n");
@@ -1402,7 +1401,7 @@ static int __devinit e752x_init_one(struct pci_dev *pdev, 
	return e752x_probe1(pdev, ent->driver_data);

}



static void __devexit e752x_remove_one(struct pci_dev *pdev)

static void e752x_remove_one(struct pci_dev *pdev)

{

	struct mem_ctl_info *mci;

	struct e752x_pvt *pvt;
@@ -1445,7 +1444,7 @@ MODULE_DEVICE_TABLE(pci, e752x_pci_tbl); 
static struct pci_driver e752x_driver = {

	.name = EDAC_MOD_STR,

	.probe = e752x_init_one,

	.remove = __devexit_p(e752x_remove_one),

	.remove = e752x_remove_one,

	.id_table = e752x_pci_tbl,

};