Commit 5f6333bd6ed3c855c725ab389eeed8bf7c198798

Authored by Kay Sievers
Committed by Haavard Skinnemoen
1 parent c80ce2d52b

avr: struct device - replace bus_id with dev_name(), dev_set_name()

(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: avr: struct device - replace bus_id with dev_name(), dev_set_name()

Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

arch/avr32/mach-at32ap/clock.c
... ... @@ -198,7 +198,7 @@
198 198 unsigned i;
199 199  
200 200 /* skip clocks coupled to devices that aren't registered */
201   - if (parent->dev && !parent->dev->bus_id[0] && !parent->users)
  201 + if (parent->dev && !dev_name(parent->dev) && !parent->users)
202 202 return;
203 203  
204 204 /* <nest spaces> name <pad to end> */
... ... @@ -214,7 +214,7 @@
214 214 parent->users ? "on" : "off", /* NOTE: not-paranoid!! */
215 215 clk_get_rate(parent));
216 216 if (parent->dev)
217   - seq_printf(r->s, ", for %s", parent->dev->bus_id);
  217 + seq_printf(r->s, ", for %s", dev_name(parent->dev));
218 218 seq_printf(r->s, "\n");
219 219  
220 220 /* cost of this scan is small, but not linear... */