This patch is part of a larger patch series which will remove
the "char bus_id[20]" name string from struct device. The device
name is managed in the kobject anyway, and without any size
limitation, and just needlessly copied into "struct device".
To set and read the device name dev_name(dev) and dev_set_name(dev)
must be used. If your code uses static kobjects, which it shouldn't
do, "const char *init_name" can be used to statically provide the
name the registered device should have. At registration time, the
init_name field is cleared, to enforce the use of dev_name(dev) to
access the device name at a later time.
We need to get rid of all occurrences of bus_id in the entire tree
to be able to enable the new interface. Please apply this patch,
and possibly convert any remaining remaining occurrences of bus_id.
We want to submit a patch to -next, which will remove bus_id from
"struct device", to find the remaining pieces to convert, and finally
switch over to the new api, which will remove the 20 bytes array
and does no longer have a size limitation.
Thanks,
Kay
From: Kay Sievers <[email protected]>
Acked-by: Greg Kroah-Hartman <[email protected]>
Subject: edac: struct device - replace bus_id with dev_name(), dev_set_name()
CC: [email protected]
Signed-Off-By: Kay Sievers <[email protected]>
---
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index 5fcd3d8..bbe1bdb 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, edac_dev_name(rover),
+ dev_name(rover->dev), edac_dev_name(rover),
rover->mod_name, rover->ctl_name, rover->dev_idx);
return 1;
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index d110392..63b1b4c 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -401,7 +401,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,
+ "%s (%s) %s %s already assigned %d\n",dev_name( p->dev),
edac_dev_name(mci), p->mod_name, p->ctl_name, p->mc_idx);
return 1;
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
index 22ec9d5..5d3c808 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, edac_dev_name(rover),
+ dev_name(rover->dev), edac_dev_name(rover),
rover->mod_name, rover->ctl_name, rover->pci_idx);
return 1;
diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
index 5c153dc..422728c 100644
--- a/drivers/edac/edac_pci_sysfs.c
+++ b/drivers/edac/edac_pci_sysfs.c
@@ -569,7 +569,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
local_irq_restore(flags);
- debugf4("PCI STATUS= 0x%04x %s\n", status, dev->dev.bus_id);
+ debugf4("PCI STATUS= 0x%04x %s\n", status, dev_name(&dev->dev));
/* check the status reg for errors on boards NOT marked as broken
* if broken, we cannot trust any of the status bits
@@ -600,13 +600,13 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
}
- debugf4("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev->dev.bus_id);
+ debugf4("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev_name(&dev->dev));
if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {
/* On bridges, need to examine secondary status register */
status = get_pci_parity_status(dev, 1);
- debugf4("PCI SEC_STATUS= 0x%04x %s\n", status, dev->dev.bus_id);
+ debugf4("PCI SEC_STATUS= 0x%04x %s\n", status, dev_name(&dev->dev));
/* check the secondary status reg for errors,
* on NOT broken boards
--- Kay Sievers <[email protected]> wrote:
> This patch is part of a larger patch series which will remove
> the "char bus_id[20]" name string from struct device. The device
> name is managed in the kobject anyway, and without any size
> limitation, and just needlessly copied into "struct device".
>
> To set and read the device name dev_name(dev) and dev_set_name(dev)
> must be used. If your code uses static kobjects, which it shouldn't
> do, "const char *init_name" can be used to statically provide the
> name the registered device should have. At registration time, the
> init_name field is cleared, to enforce the use of dev_name(dev) to
> access the device name at a later time.
>
> We need to get rid of all occurrences of bus_id in the entire tree
> to be able to enable the new interface. Please apply this patch,
> and possibly convert any remaining remaining occurrences of bus_id.
>
> We want to submit a patch to -next, which will remove bus_id from
> "struct device", to find the remaining pieces to convert, and finally
> switch ober to the new api, which will remove the 20 bytes array
> and does no longer have a size limitation.
>
> Thanks,
> Kay
>
>
> From: Kay Sievers <[email protected]>
> Acked-by: Greg Kroah-Hartman <[email protected]>
> Subject: edac: struct device - replace bus_id with dev_name(), dev_set_name()
>
> CC: [email protected]
> Signed-Off-By: Kay Sievers <[email protected]>
Acked-by: Doug Thompson <[email protected]>
> ---
>
>
> diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
> index 5fcd3d8..bbe1bdb 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, edac_dev_name(rover),
> + dev_name(rover->dev), edac_dev_name(rover),
> rover->mod_name, rover->ctl_name, rover->dev_idx);
> return 1;
>
> diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
> index d110392..63b1b4c 100644
> --- a/drivers/edac/edac_mc.c
> +++ b/drivers/edac/edac_mc.c
> @@ -401,7 +401,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,
> + "%s (%s) %s %s already assigned %d\n",dev_name( p->dev),
> edac_dev_name(mci), p->mod_name, p->ctl_name, p->mc_idx);
> return 1;
>
> diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
> index 22ec9d5..5d3c808 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, edac_dev_name(rover),
> + dev_name(rover->dev), edac_dev_name(rover),
> rover->mod_name, rover->ctl_name, rover->pci_idx);
> return 1;
>
> diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
> index 5c153dc..422728c 100644
> --- a/drivers/edac/edac_pci_sysfs.c
> +++ b/drivers/edac/edac_pci_sysfs.c
> @@ -569,7 +569,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
>
> local_irq_restore(flags);
>
> - debugf4("PCI STATUS= 0x%04x %s\n", status, dev->dev.bus_id);
> + debugf4("PCI STATUS= 0x%04x %s\n", status, dev_name(&dev->dev));
>
> /* check the status reg for errors on boards NOT marked as broken
> * if broken, we cannot trust any of the status bits
> @@ -600,13 +600,13 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
> }
>
>
> - debugf4("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev->dev.bus_id);
> + debugf4("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev_name(&dev->dev));
>
> if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {
> /* On bridges, need to examine secondary status register */
> status = get_pci_parity_status(dev, 1);
>
> - debugf4("PCI SEC_STATUS= 0x%04x %s\n", status, dev->dev.bus_id);
> + debugf4("PCI SEC_STATUS= 0x%04x %s\n", status, dev_name(&dev->dev));
>
> /* check the secondary status reg for errors,
> * on NOT broken boards
>
>
>
W1DUG
On Thu, 30 Oct 2008 01:39:05 +0100
Kay Sievers <[email protected]> wrote:
> Subject: edac: struct device - replace bus_id with dev_name(), dev_set_name()
um,
ERROR: space required after that ',' (ctx:VxV)
#40: FILE: drivers/edac/edac_mc.c:404:
+ "%s (%s) %s %s already assigned %d\n",dev_name( p->dev),
^
ERROR: space prohibited after that open parenthesis '('
#40: FILE: drivers/edac/edac_mc.c:404:
+ "%s (%s) %s %s already assigned %d\n",dev_name( p->dev),
where did this crap come from? It looks like some automated thing
placed a space at the wrong end of the string?
If so, are we about to send hundreds of such mistakes into the tree?
(checkpatch! Is good!)
On Mon, Nov 3, 2008 at 23:57, Andrew Morton <[email protected]> wrote:
> On Thu, 30 Oct 2008 01:39:05 +0100
> Kay Sievers <[email protected]> wrote:
>
>> Subject: edac: struct device - replace bus_id with dev_name(), dev_set_name()
>
> um,
>
> ERROR: space required after that ',' (ctx:VxV)
> #40: FILE: drivers/edac/edac_mc.c:404:
> + "%s (%s) %s %s already assigned %d\n",dev_name( p->dev),
> ^
>
> ERROR: space prohibited after that open parenthesis '('
> #40: FILE: drivers/edac/edac_mc.c:404:
> + "%s (%s) %s %s already assigned %d\n",dev_name( p->dev),
>
>
> where did this crap come from? It looks like some automated thing
> placed a space at the wrong end of the string?
>
> If so, are we about to send hundreds of such mistakes into the tree?
It was me feeling automated, maybe 4 am in the morning.
It's only one instance in the ~60 patches I have so far:
$ cat * | wc -l
7255
$ grep '( ' *
bus_id-edac.patch:+ "%s (%s) %s %s already assigned %d\n",dev_name( p->dev),
Sorry for that.
Thanks,
Kay