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

Commit 17aa7e03 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

dev_name introduction fall out fix 



Commit 06916639 ("driver-core: add
dev_name() to help transition away from using bus_id") added a static
inline dev_name() and used it in dev_printk.

Unfortunately, drivers/edac/edac_core.h defines a macro called
dev_name().  Rename the latter.

Diagnosis by Tony Breeds and Michael Ellerman.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarDoug Thompson <dougthompson@xmission.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 108c1961

drivers/edac/edac_core.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ extern int edac_debug_level; 
#define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \

	PCI_DEVICE_ID_ ## vend ## _ ## dev



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

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



/* memory devices */

enum dev_type {

drivers/edac/edac_device.c

+3 −3
Original line number Diff line number Diff line
@@ -333,7 +333,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),

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

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

	return 1;
@@ -538,7 +538,7 @@ int edac_device_add_device(struct edac_device_ctl_info *edac_dev) 
				"'%s': DEV '%s' (%s)\n",

				edac_dev->mod_name,

				edac_dev->ctl_name,

				dev_name(edac_dev),

				edac_dev_name(edac_dev),

				edac_op_state_to_string(edac_dev->op_state));



	mutex_unlock(&device_ctls_mutex);
@@ -599,7 +599,7 @@ struct edac_device_ctl_info *edac_device_del_device(struct device *dev) 
	edac_printk(KERN_INFO, EDAC_MC,

		"Removed device %d for %s %s: DEV %s\n",

		edac_dev->dev_idx,

		edac_dev->mod_name, edac_dev->ctl_name, dev_name(edac_dev));

		edac_dev->mod_name, edac_dev->ctl_name, edac_dev_name(edac_dev));



	return edac_dev;

}

drivers/edac/edac_mc.c

+3 −3
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static int add_mc_to_global_list(struct mem_ctl_info *mci) 
fail0:

	edac_printk(KERN_WARNING, EDAC_MC,

		"%s (%s) %s %s already assigned %d\n", p->dev->bus_id,

		dev_name(mci), p->mod_name, p->ctl_name, p->mc_idx);

		edac_dev_name(mci), p->mod_name, p->ctl_name, p->mc_idx);

	return 1;



fail1:
@@ -517,7 +517,7 @@ int edac_mc_add_mc(struct mem_ctl_info *mci) 


	/* Report action taken */

	edac_mc_printk(mci, KERN_INFO, "Giving out device to '%s' '%s':"

		" DEV %s\n", mci->mod_name, mci->ctl_name, dev_name(mci));

		" DEV %s\n", mci->mod_name, mci->ctl_name, edac_dev_name(mci));



	mutex_unlock(&mem_ctls_mutex);

	return 0;
@@ -565,7 +565,7 @@ struct mem_ctl_info *edac_mc_del_mc(struct device *dev) 


	edac_printk(KERN_INFO, EDAC_MC,

		"Removed device %d for %s %s: DEV %s\n", mci->mc_idx,

		mci->mod_name, mci->ctl_name, dev_name(mci));

		mci->mod_name, mci->ctl_name, edac_dev_name(mci));



	return mci;

}

drivers/edac/edac_pci.c

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static int add_edac_pci_to_global_list(struct edac_pci_ctl_info *pci) 
fail0:

	edac_printk(KERN_WARNING, EDAC_PCI,

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

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

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

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

	return 1;
@@ -360,7 +360,7 @@ int edac_pci_add_device(struct edac_pci_ctl_info *pci, int edac_idx) 
			" DEV '%s' (%s)\n",

			pci->mod_name,

			pci->ctl_name,

			dev_name(pci), edac_op_state_to_string(pci->op_state));

			edac_dev_name(pci), edac_op_state_to_string(pci->op_state));



	mutex_unlock(&edac_pci_ctls_mutex);

	return 0;
@@ -415,7 +415,7 @@ struct edac_pci_ctl_info *edac_pci_del_device(struct device *dev) 


	edac_printk(KERN_INFO, EDAC_PCI,

		"Removed device %d for %s %s: DEV %s\n",

		pci->pci_idx, pci->mod_name, pci->ctl_name, dev_name(pci));

		pci->pci_idx, pci->mod_name, pci->ctl_name, edac_dev_name(pci));



	return pci;

}