Commit 456a2f95 authored by Dave Jiang's avatar Dave Jiang Committed by Linus Torvalds
Browse files

drivers/edac: drivers to use new PCI operation 



Move x86 drivers to new pci controller setup

Signed-off-by: default avatarDave Jiang <djiang@mvista.com>
Signed-off-by: default avatarDouglas Thompson <dougthompson@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cddbfcac

drivers/edac/amd76x_edac.c

+16 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ static const struct amd76x_dev_info amd76x_devs[] = { 
		    .ctl_name = "AMD762"},

};



static struct edac_pci_ctl_info *amd76x_pci;



/**

 *	amd76x_get_error_info	-	fetch error information

 *	@mci: Memory controller
@@ -266,6 +268,17 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) 
		goto fail;

	}



	/* allocating generic PCI control info */

	amd76x_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);

	if (!amd76x_pci) {

		printk(KERN_WARNING

			"%s(): Unable to create PCI control\n",

			__func__);

		printk(KERN_WARNING

			"%s(): PCI error report via EDAC not setup\n",

			__func__);

	}



	/* get this far and it's successful */

	debugf3("%s(): success\n", __func__);

	return 0;
@@ -299,6 +312,9 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev) 


	debugf0("%s()\n", __func__);



	if (amd76x_pci)

		edac_pci_release_generic_ctl(amd76x_pci);



	if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)

		return;

drivers/edac/e7xxx_edac.c

+16 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ struct e7xxx_error_info { 
	u32 dram_uelog_add;

};



static struct edac_pci_ctl_info *e7xxx_pci;



static const struct e7xxx_dev_info e7xxx_devs[] = {

	[E7500] = {

		   .err_dev = PCI_DEVICE_ID_INTEL_7500_1_ERR,
@@ -481,6 +483,17 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) 
		goto fail1;

	}



	/* allocating generic PCI control info */

	e7xxx_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);

	if (!e7xxx_pci) {

		printk(KERN_WARNING

			"%s(): Unable to create PCI control\n",

			__func__);

		printk(KERN_WARNING

			"%s(): PCI error report via EDAC not setup\n",

			__func__);

	}



	/* get this far and it's successful */

	debugf3("%s(): success\n", __func__);

	return 0;
@@ -512,6 +525,9 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev) 


	debugf0("%s()\n", __func__);



	if (e7xxx_pci)

		edac_pci_release_generic_ctl(e7xxx_pci);



	if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)

		return;

drivers/edac/i3000_edac.c

+15 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ static const struct i3000_dev_info i3000_devs[] = { 


static struct pci_dev *mci_pdev = NULL;

static int i3000_registered = 1;

static struct edac_pci_ctl_info *i3000_pci;



static void i3000_get_error_info(struct mem_ctl_info *mci,

				 struct i3000_error_info *info)
@@ -373,6 +374,17 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx) 
		goto fail;

	}



	/* allocating generic PCI control info */

	i3000_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);

	if (!i3000_pci) {

		printk(KERN_WARNING

			"%s(): Unable to create PCI control\n",

			__func__);

		printk(KERN_WARNING

			"%s(): PCI error report via EDAC not setup\n",

			__func__);

	}



	/* get this far and it's successful */

	debugf3("MC: %s(): success\n", __func__);

	return 0;
@@ -408,6 +420,9 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev) 


	debugf0("%s()\n", __func__);



	if (i3000_pci)

		edac_pci_release_generic_ctl(i3000_pci);



	if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)

		return;

drivers/edac/i5000_edac.c

+17 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
 * Alter this version for the I5000 module when modifications are made

 */

#define I5000_REVISION    " Ver: 2.0.12 " __DATE__

#define EDAC_MOD_STR      "i5000_edac"



#define i5000_printk(level, fmt, arg...) \

        edac_printk(level, "i5000", fmt, ##arg)
@@ -381,6 +382,8 @@ struct i5000_error_info { 


};



static struct edac_pci_ctl_info *i5000_pci;



/******************************************************************************

 *	i5000_get_error_info	Retrieve the hardware error information from

 *				the hardware and cache it in the 'info'
@@ -1375,6 +1378,17 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx) 


	i5000_clear_error(mci);



	/* allocating generic PCI control info */

	i5000_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);

	if (!i5000_pci) {

		printk(KERN_WARNING

			"%s(): Unable to create PCI control\n",

			__func__);

		printk(KERN_WARNING

			"%s(): PCI error report via EDAC not setup\n",

			__func__);

	}



	return 0;



	/* Error exit unwinding stack */
@@ -1420,6 +1434,9 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev) 


	debugf0(__FILE__ ": %s()\n", __func__);



	if (i5000_pci)

		edac_pci_release_generic_ctl(i5000_pci);



	if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)

		return;

drivers/edac/i82443bxgx_edac.c

+16 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ struct i82443bxgx_edacmc_error_info { 
	u32 eap;

};



static struct edac_pci_ctl_info *i82443bxgx_pci;



static void i82443bxgx_edacmc_get_error_info(struct mem_ctl_info *mci,

					     struct i82443bxgx_edacmc_error_info

					     *info)
@@ -316,6 +318,17 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx) 
		goto fail;

	}



	/* allocating generic PCI control info */

	i82443bxgx_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);

	if (!i82443bxgx_pci) {

		printk(KERN_WARNING

			"%s(): Unable to create PCI control\n",

			__func__);

		printk(KERN_WARNING

			"%s(): PCI error report via EDAC not setup\n",

			__func__);

	}



	debugf3("MC: " __FILE__ ": %s(): success\n", __func__);

	return 0;
@@ -342,6 +355,9 @@ static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev) 


	debugf0(__FILE__ ": %s()\n", __func__);



	if (i82443bxgx_pci)

		edac_pci_release_generic_ctl(i82443bxgx_pci);



	if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)

		return;