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

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

drivers/edac: add dev_name getter function 



Move dev_name() macro to a more generic interface since it's not possible
to determine whether a device is pci, platform, or of_device easily.

Now each low level driver sets the name into the control structure, and
the EDAC core references the control structure for the information.

Better abstraction.

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 20bcb7a8

drivers/edac/amd76x_edac.c

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) 
	mci->mod_name = EDAC_MOD_STR;

	mci->mod_ver = AMD76X_REVISION;

	mci->ctl_name = amd76x_devs[dev_idx].ctl_name;

	mci->dev_name = pci_name(pdev);

	mci->edac_check = amd76x_check;

	mci->ctl_page_to_phys = NULL;

drivers/edac/e752x_edac.c

+1 −0
Original line number Diff line number Diff line
@@ -1004,6 +1004,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) 


	debugf3("%s(): more mci init\n", __func__);

	mci->ctl_name = pvt->dev_info->ctl_name;

	mci->dev_name = pci_name(pdev);

	mci->edac_check = e752x_check;

	mci->ctl_page_to_phys = ctl_page_to_phys;

drivers/edac/e7xxx_edac.c

+1 −0
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) 


	debugf3("%s(): more mci init\n", __func__);

	mci->ctl_name = pvt->dev_info->ctl_name;

	mci->dev_name = pci_name(pdev);

	mci->edac_check = e7xxx_check;

	mci->ctl_page_to_phys = ctl_page_to_phys;

	e7xxx_init_csrows(mci, pdev, dev_idx, drc);

drivers/edac/edac_core.h

+3 −5
Original line number Diff line number Diff line
@@ -95,11 +95,7 @@ extern int edac_debug_level; 
#define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \

	PCI_DEVICE_ID_ ## vend ## _ ## dev



#if defined(CONFIG_X86) && defined(CONFIG_PCI)

#define dev_name(dev) pci_name(to_pci_dev(dev))

#else

#define dev_name(dev) to_platform_device(dev)->name

#endif

#define dev_name(dev) (dev)->dev_name



/* memory devices */

enum dev_type {
@@ -368,6 +364,7 @@ struct mem_ctl_info { 
	const char *mod_name;

	const char *mod_ver;

	const char *ctl_name;

	const char *dev_name;

	char proc_name[MC_PROC_NAME_MAX_LEN + 1];

	void *pvt_info;

	u32 ue_noinfo_count;	/* Uncorrectable Errors w/o info */
@@ -538,6 +535,7 @@ struct edac_device_ctl_info { 


	const char *mod_name;	/* module name */

	const char *ctl_name;	/* edac controller  name */

	const char *dev_name;	/* pci/platform/etc... name */



	void *pvt_info;		/* pointer to 'private driver' info */

drivers/edac/edac_device.c

+3 −3
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int add_edac_dev_to_global_list (struct edac_device_ctl_info *edac_dev) 
fail0:

	edac_printk(KERN_WARNING, EDAC_MC,

		"%s (%s) %s %s already assigned %d\n",

		rover->dev->bus_id, dev_name(rover->dev),

		rover->dev->bus_id, dev_name(rover),

		rover->mod_name, rover->ctl_name, rover->dev_idx);

	return 1;
@@ -491,7 +491,7 @@ int edac_device_add_device(struct edac_device_ctl_info *edac_dev, int edac_idx) 
		"Giving out device to module '%s' controller '%s': DEV '%s' (%s)\n",

		edac_dev->mod_name,

		edac_dev->ctl_name,

		dev_name(edac_dev->dev),

		dev_name(edac_dev),

		edac_op_state_toString(edac_dev)

		);
@@ -553,7 +553,7 @@ struct edac_device_ctl_info * edac_device_del_device(struct device *dev) 
		edac_dev->dev_idx,

		edac_dev->mod_name,

		edac_dev->ctl_name,

		dev_name(edac_dev->dev));

		dev_name(edac_dev));



	return edac_dev;

}