* linux-next: upstream edac build failure
@ 2008-05-05 4:02 Stephen Rothwell
2008-05-05 4:28 ` Michael Ellerman
2008-05-05 21:22 ` Doug Thompson
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-05-05 4:02 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, LKML, Kay Sievers, dougthompson, Linus, Andrew Morton,
bluesmoke-devel, tony, michael
[-- Attachment #1: Type: text/plain, Size: 6133 bytes --]
Hi Greg,
Today's linux-next build (powerpc allyesconfig) fails like this:
drivers/edac/cell_edac.c: In function 'cell_edac_count_ce':
drivers/edac/cell_edac.c:38: error: 'struct device' has no member named 'dev_name'
drivers/edac/cell_edac.c: In function 'cell_edac_count_ue':
drivers/edac/cell_edac.c:59: error: 'struct device' has no member named 'dev_name'
drivers/edac/cell_edac.c: In function 'cell_edac_init_csrows':
drivers/edac/cell_edac.c:145: error: 'struct device' has no member named 'dev_name'
drivers/edac/cell_edac.c: In function 'cell_edac_probe':
drivers/edac/cell_edac.c:168: error: 'struct device' has no member named 'dev_name'
drivers/edac/cell_edac.c:175: error: 'struct device' has no member named 'dev_name'
drivers/edac/cell_edac.c:179: error: 'struct device' has no member named 'dev_name'
drivers/edac/cell_edac.c:204: error: 'struct device' has no member named 'dev_name'
Commit 06916639e2fed9ee475efef2747a1b7429f8fe76 ("driver-core: add
dev_name() to help transition away from using bus_id") in Linus' tree
added a static inline dev_name() and used it in dev_printk.
Unfortunately, drivers/edac/edac_core.h defines a macro called dev_name().
I have applied the following patch (diagnosis by Tony Breeds and Michael
Ellerman).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
>From 58d998b394ddb1f4bff4fb79feccb8eb102e22c3 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 May 2008 13:54:19 +1000
Subject: [PATCH] dev_name introduction fall out fix
Commit 06916639e2fed9ee475efef2747a1b7429f8fe76 ("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: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/edac/edac_core.h | 2 +-
drivers/edac/edac_device.c | 6 +++---
drivers/edac/edac_mc.c | 6 +++---
drivers/edac/edac_pci.c | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index a9aa845..b27b13c 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -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 {
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index 63372fa..5fcd3d8 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -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;
}
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index a4cf164..d110392 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -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;
}
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
index 9b24340..22ec9d5 100644
--- a/drivers/edac/edac_pci.c
+++ b/drivers/edac/edac_pci.c
@@ -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;
}
--
1.5.5.1
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: linux-next: upstream edac build failure
2008-05-05 4:02 linux-next: upstream edac build failure Stephen Rothwell
@ 2008-05-05 4:28 ` Michael Ellerman
2008-05-05 21:22 ` Doug Thompson
1 sibling, 0 replies; 3+ messages in thread
From: Michael Ellerman @ 2008-05-05 4:28 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, LKML, Kay Sievers, dougthompson, Linus,
Andrew Morton, bluesmoke-devel, tony
[-- Attachment #1: Type: text/plain, Size: 474 bytes --]
On Mon, 2008-05-05 at 14:02 +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next build (powerpc allyesconfig) fails like this:
Actually linus' tree breaks in the same way, not just linux-next.
cheers
--
Michael Ellerman
OzLabs, IBM Australia Development Lab
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)
We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: upstream edac build failure
2008-05-05 4:02 linux-next: upstream edac build failure Stephen Rothwell
2008-05-05 4:28 ` Michael Ellerman
@ 2008-05-05 21:22 ` Doug Thompson
1 sibling, 0 replies; 3+ messages in thread
From: Doug Thompson @ 2008-05-05 21:22 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH
Cc: linux-next, LKML, Kay Sievers, dougthompson, Linus, Andrew Morton,
bluesmoke-devel, tony, michael
--- Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Greg,
>
> Today's linux-next build (powerpc allyesconfig) fails like this:
>
> drivers/edac/cell_edac.c: In function 'cell_edac_count_ce':
> drivers/edac/cell_edac.c:38: error: 'struct device' has no member named 'dev_name'
> drivers/edac/cell_edac.c: In function 'cell_edac_count_ue':
> drivers/edac/cell_edac.c:59: error: 'struct device' has no member named 'dev_name'
> drivers/edac/cell_edac.c: In function 'cell_edac_init_csrows':
> drivers/edac/cell_edac.c:145: error: 'struct device' has no member named 'dev_name'
> drivers/edac/cell_edac.c: In function 'cell_edac_probe':
> drivers/edac/cell_edac.c:168: error: 'struct device' has no member named 'dev_name'
> drivers/edac/cell_edac.c:175: error: 'struct device' has no member named 'dev_name'
> drivers/edac/cell_edac.c:179: error: 'struct device' has no member named 'dev_name'
> drivers/edac/cell_edac.c:204: error: 'struct device' has no member named 'dev_name'
>
> Commit 06916639e2fed9ee475efef2747a1b7429f8fe76 ("driver-core: add
> dev_name() to help transition away from using bus_id") in Linus' tree
> added a static inline dev_name() and used it in dev_printk.
> Unfortunately, drivers/edac/edac_core.h defines a macro called dev_name().
>
> I have applied the following patch (diagnosis by Tony Breeds and Michael
> Ellerman).
Ouch. Change of the EDAC dev_name() to edac_dev_name() looks good to me.
Thanks for the patch.
doug t
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> From 58d998b394ddb1f4bff4fb79feccb8eb102e22c3 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 5 May 2008 13:54:19 +1000
> Subject: [PATCH] dev_name introduction fall out fix
>
> Commit 06916639e2fed9ee475efef2747a1b7429f8fe76 ("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: Stephen Rothwell <sfr@canb.auug.org.au>
Ack: Doug Thompson <dougthompson@xmission.com>
> ---
> drivers/edac/edac_core.h | 2 +-
> drivers/edac/edac_device.c | 6 +++---
> drivers/edac/edac_mc.c | 6 +++---
> drivers/edac/edac_pci.c | 6 +++---
> 4 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
> index a9aa845..b27b13c 100644
> --- a/drivers/edac/edac_core.h
> +++ b/drivers/edac/edac_core.h
> @@ -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 {
> diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
> index 63372fa..5fcd3d8 100644
> --- a/drivers/edac/edac_device.c
> +++ b/drivers/edac/edac_device.c
> @@ -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;
> }
> diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
> index a4cf164..d110392 100644
> --- a/drivers/edac/edac_mc.c
> +++ b/drivers/edac/edac_mc.c
> @@ -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;
> }
> diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
> index 9b24340..22ec9d5 100644
> --- a/drivers/edac/edac_pci.c
> +++ b/drivers/edac/edac_pci.c
> @@ -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;
> }
> --
> 1.5.5.1
>
>
W1DUG
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-05-05 21:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-05 4:02 linux-next: upstream edac build failure Stephen Rothwell
2008-05-05 4:28 ` Michael Ellerman
2008-05-05 21:22 ` Doug Thompson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox