* parisc: struct device - replace bus_id with dev_name(), dev_set_name()
@ 2008-11-07 0:42 Kay Sievers
2008-11-25 18:22 ` Kyle McMartin
0 siblings, 1 reply; 6+ messages in thread
From: Kay Sievers @ 2008-11-07 0:42 UTC (permalink / raw)
To: Kyle McMartin, Matthew Wilcox; +Cc: Greg KH, linux-kernel
(I did not compile or test it, please let me know, or help fixing
it, if something is wrong with the conversion)
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 <kay.sievers@vrfy.org>
Subject: parisc: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: linux-parisc@vger.kernel.org
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
---
arch/parisc/include/asm/parisc-device.h | 4 ++--
arch/parisc/kernel/drivers.c | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
--- a/arch/parisc/include/asm/parisc-device.h
+++ b/arch/parisc/include/asm/parisc-device.h
@@ -42,9 +42,9 @@ struct parisc_driver {
#define to_parisc_driver(d) container_of(d, struct parisc_driver, drv)
#define parisc_parent(d) to_parisc_device(d->dev.parent)
-static inline char *parisc_pathname(struct parisc_device *d)
+static inline const char *parisc_pathname(struct parisc_device *d)
{
- return d->dev.bus_id;
+ return dev_name(&d->dev);
}
static inline void
--- a/arch/parisc/kernel/drivers.c
+++ b/arch/parisc/kernel/drivers.c
@@ -43,7 +43,7 @@ struct hppa_dma_ops *hppa_dma_ops __read
EXPORT_SYMBOL(hppa_dma_ops);
static struct device root = {
- .bus_id = "parisc",
+ .init_name = "parisc",
};
static inline int check_dev(struct device *dev)
@@ -393,7 +393,8 @@ EXPORT_SYMBOL(print_pci_hwpath);
static void setup_bus_id(struct parisc_device *padev)
{
struct hardware_path path;
- char *output = padev->dev.bus_id;
+ char name[20];
+ char *output = name;
int i;
get_node_path(padev->dev.parent, &path);
@@ -404,6 +405,7 @@ static void setup_bus_id(struct parisc_d
output += sprintf(output, "%u:", (unsigned char) path.bc[i]);
}
sprintf(output, "%u", (unsigned char) padev->hw_path);
+ dev_set_name(&padev->dev, name);
}
struct parisc_device * create_tree_node(char id, struct device *parent)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: parisc: struct device - replace bus_id with dev_name(), dev_set_name()
2008-11-07 0:42 Kay Sievers
@ 2008-11-25 18:22 ` Kyle McMartin
0 siblings, 0 replies; 6+ messages in thread
From: Kyle McMartin @ 2008-11-25 18:22 UTC (permalink / raw)
To: Kay Sievers; +Cc: Kyle McMartin, Matthew Wilcox, Greg KH, linux-kernel
On Fri, Nov 07, 2008 at 01:42:46AM +0100, Kay Sievers wrote:
> (I did not compile or test it, please let me know, or help fixing
> it, if something is wrong with the conversion)
>
> 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.
>
Applied, thanks Kay.
^ permalink raw reply [flat|nested] 6+ messages in thread
* parisc: struct device - replace bus_id with dev_name(), dev_set_name()
@ 2009-01-25 22:53 Kay Sievers
2009-01-26 4:55 ` Grant Grundler
0 siblings, 1 reply; 6+ messages in thread
From: Kay Sievers @ 2009-01-25 22:53 UTC (permalink / raw)
To: kyle, matthew; +Cc: linux-parisc, gregkh
From: Kay Sievers <kay.sievers@vrfy.org>
Subject: parisc: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: kyle@mcmartin.ca
Cc: matthew@wil.cx
Cc: linux-parisc@vger.kernel.org
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
---
drivers/parisc/dino.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -479,7 +479,7 @@ dino_card_setup(struct pci_bus *bus, voi
res = &dino_dev->hba.lmmio_space;
res->flags = IORESOURCE_MEM;
size = scnprintf(name, sizeof(name), "Dino LMMIO (%s)",
- bus->bridge->bus_id);
+ dev_name(bus->bridge));
res->name = kmalloc(size+1, GFP_KERNEL);
if(res->name)
strcpy((char *)res->name, name);
@@ -493,7 +493,7 @@ dino_card_setup(struct pci_bus *bus, voi
struct list_head *ln, *tmp_ln;
printk(KERN_ERR "Dino: cannot attach bus %s\n",
- bus->bridge->bus_id);
+ dev_name(bus->bridge));
/* kill the bus, we can't do anything with it */
list_for_each_safe(ln, tmp_ln, &bus->devices) {
struct pci_dev *dev = pci_dev_b(ln);
@@ -611,12 +611,12 @@ dino_fixup_bus(struct pci_bus *bus)
}
DBG("DEBUG %s assigning %d [0x%lx,0x%lx]\n",
- bus->self->dev.bus_id, i,
+ dev_name(&bus->self->dev), i,
bus->self->resource[i].start,
bus->self->resource[i].end);
pci_assign_resource(bus->self, i);
DBG("DEBUG %s after assign %d [0x%lx,0x%lx]\n",
- bus->self->dev.bus_id, i,
+ dev_name(&bus->self->dev), i,
bus->self->resource[i].start,
bus->self->resource[i].end);
}
@@ -1026,7 +1026,8 @@ static int __init dino_probe(struct pari
dino_current_bus = bus->subordinate + 1;
pci_bus_assign_resources(bus);
} else {
- printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (probably duplicate bus number %d)\n", dev->dev.bus_id, dino_current_bus);
+ printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (probably duplicate bus number %d)\n",
+ dev_name(&dev->dev), dino_current_bus);
/* increment the bus number in case of duplicates */
dino_current_bus++;
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: parisc: struct device - replace bus_id with dev_name(), dev_set_name()
2009-01-25 22:53 parisc: struct device - replace bus_id with dev_name(), dev_set_name() Kay Sievers
@ 2009-01-26 4:55 ` Grant Grundler
2009-01-26 12:27 ` Kay Sievers
2009-01-26 17:39 ` Greg KH
0 siblings, 2 replies; 6+ messages in thread
From: Grant Grundler @ 2009-01-26 4:55 UTC (permalink / raw)
To: Kay Sievers; +Cc: kyle, matthew, linux-parisc, gregkh
On Sun, Jan 25, 2009 at 11:53:16PM +0100, Kay Sievers wrote:
> From: Kay Sievers <kay.sievers@vrfy.org>
> Subject: parisc: struct device - replace bus_id with dev_name(), dev_set_name()
In general, no objection. Just one nit below.
Otherwise, please add:
Reviewed-by: Grant Grundler <grundler@parisc-linux.org>
>
> Cc: kyle@mcmartin.ca
> Cc: matthew@wil.cx
> Cc: linux-parisc@vger.kernel.org
> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
> ---
> drivers/parisc/dino.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> --- a/drivers/parisc/dino.c
> +++ b/drivers/parisc/dino.c
> @@ -479,7 +479,7 @@ dino_card_setup(struct pci_bus *bus, voi
> res = &dino_dev->hba.lmmio_space;
> res->flags = IORESOURCE_MEM;
> size = scnprintf(name, sizeof(name), "Dino LMMIO (%s)",
> - bus->bridge->bus_id);
> + dev_name(bus->bridge));
> res->name = kmalloc(size+1, GFP_KERNEL);
> if(res->name)
> strcpy((char *)res->name, name);
> @@ -493,7 +493,7 @@ dino_card_setup(struct pci_bus *bus, voi
> struct list_head *ln, *tmp_ln;
>
> printk(KERN_ERR "Dino: cannot attach bus %s\n",
> - bus->bridge->bus_id);
> + dev_name(bus->bridge));
I think the "cannot attach bus" string needs to be changed to
"cannot attach dev" or whatever dev_name() is supposed to represent.
While the code in include/linux/device.h is using "bus_id",
the comments say:
static inline const char *dev_name(const struct device *dev)
{
/* will be changed into kobject_name(&dev->kobj) in the near future */
return dev->bus_id;
}
And that could mean anything.
The rest look fine.
thanks,
grant
> /* kill the bus, we can't do anything with it */
> list_for_each_safe(ln, tmp_ln, &bus->devices) {
> struct pci_dev *dev = pci_dev_b(ln);
> @@ -611,12 +611,12 @@ dino_fixup_bus(struct pci_bus *bus)
> }
>
> DBG("DEBUG %s assigning %d [0x%lx,0x%lx]\n",
> - bus->self->dev.bus_id, i,
> + dev_name(&bus->self->dev), i,
> bus->self->resource[i].start,
> bus->self->resource[i].end);
> pci_assign_resource(bus->self, i);
> DBG("DEBUG %s after assign %d [0x%lx,0x%lx]\n",
> - bus->self->dev.bus_id, i,
> + dev_name(&bus->self->dev), i,
> bus->self->resource[i].start,
> bus->self->resource[i].end);
> }
> @@ -1026,7 +1026,8 @@ static int __init dino_probe(struct pari
> dino_current_bus = bus->subordinate + 1;
> pci_bus_assign_resources(bus);
> } else {
> - printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (probably duplicate bus number %d)\n", dev->dev.bus_id, dino_current_bus);
> + printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (probably duplicate bus number %d)\n",
> + dev_name(&dev->dev), dino_current_bus);
> /* increment the bus number in case of duplicates */
> dino_current_bus++;
> }
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: parisc: struct device - replace bus_id with dev_name(), dev_set_name()
2009-01-26 4:55 ` Grant Grundler
@ 2009-01-26 12:27 ` Kay Sievers
2009-01-26 17:39 ` Greg KH
1 sibling, 0 replies; 6+ messages in thread
From: Kay Sievers @ 2009-01-26 12:27 UTC (permalink / raw)
To: Grant Grundler; +Cc: kyle, matthew, linux-parisc, gregkh
On Mon, Jan 26, 2009 at 05:55, Grant Grundler <grundler@parisc-linux.org> wrote:
> On Sun, Jan 25, 2009 at 11:53:16PM +0100, Kay Sievers wrote:
>> From: Kay Sievers <kay.sievers@vrfy.org>
>> Subject: parisc: struct device - replace bus_id with dev_name(), dev_set_name()
>
> In general, no objection. Just one nit below.
>
> Otherwise, please add:
> Reviewed-by: Grant Grundler <grundler@parisc-linux.org>
>> printk(KERN_ERR "Dino: cannot attach bus %s\n",
>> - bus->bridge->bus_id);
>> + dev_name(bus->bridge));
>
> I think the "cannot attach bus" string needs to be changed to
> "cannot attach dev" or whatever dev_name() is supposed to represent.
The code probably uses a "struct device" to represent a "bus", which
sounds fine because the "devices" are more "objects" than "devices"
sometimes.
> While the code in include/linux/device.h is using "bus_id",
> the comments say:
>
> static inline const char *dev_name(const struct device *dev)
> {
> /* will be changed into kobject_name(&dev->kobj) in the near future */
> return dev->bus_id;
> }
It's the "name" of a "device", the comment has already gone away with
the final patch in the bus_id series.
Thanks,
Kay
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: parisc: struct device - replace bus_id with dev_name(), dev_set_name()
2009-01-26 4:55 ` Grant Grundler
2009-01-26 12:27 ` Kay Sievers
@ 2009-01-26 17:39 ` Greg KH
1 sibling, 0 replies; 6+ messages in thread
From: Greg KH @ 2009-01-26 17:39 UTC (permalink / raw)
To: Grant Grundler; +Cc: Kay Sievers, kyle, matthew, linux-parisc
On Sun, Jan 25, 2009 at 09:55:23PM -0700, Grant Grundler wrote:
> On Sun, Jan 25, 2009 at 11:53:16PM +0100, Kay Sievers wrote:
> > From: Kay Sievers <kay.sievers@vrfy.org>
> > Subject: parisc: struct device - replace bus_id with dev_name(), dev_set_name()
>
> In general, no objection. Just one nit below.
>
> Otherwise, please add:
> Reviewed-by: Grant Grundler <grundler@parisc-linux.org>
Added, thanks.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-01-26 17:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-25 22:53 parisc: struct device - replace bus_id with dev_name(), dev_set_name() Kay Sievers
2009-01-26 4:55 ` Grant Grundler
2009-01-26 12:27 ` Kay Sievers
2009-01-26 17:39 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2008-11-07 0:42 Kay Sievers
2008-11-25 18:22 ` Kyle McMartin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.