parisc: 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

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>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

authored by Kay Sievers and committed by Kyle McMartin 90f67130 7a3f5134

+6 -4
+2 -2
arch/parisc/include/asm/parisc-device.h
··· 42 42 #define to_parisc_driver(d) container_of(d, struct parisc_driver, drv) 43 43 #define parisc_parent(d) to_parisc_device(d->dev.parent) 44 44 45 - static inline char *parisc_pathname(struct parisc_device *d) 45 + static inline const char *parisc_pathname(struct parisc_device *d) 46 46 { 47 - return d->dev.bus_id; 47 + return dev_name(&d->dev); 48 48 } 49 49 50 50 static inline void
+4 -2
arch/parisc/kernel/drivers.c
··· 43 43 EXPORT_SYMBOL(hppa_dma_ops); 44 44 45 45 static struct device root = { 46 - .bus_id = "parisc", 46 + .init_name = "parisc", 47 47 }; 48 48 49 49 static inline int check_dev(struct device *dev) ··· 393 393 static void setup_bus_id(struct parisc_device *padev) 394 394 { 395 395 struct hardware_path path; 396 - char *output = padev->dev.bus_id; 396 + char name[20]; 397 + char *output = name; 397 398 int i; 398 399 399 400 get_node_path(padev->dev.parent, &path); ··· 405 404 output += sprintf(output, "%u:", (unsigned char) path.bc[i]); 406 405 } 407 406 sprintf(output, "%u", (unsigned char) padev->hw_path); 407 + dev_set_name(&padev->dev, name); 408 408 } 409 409 410 410 struct parisc_device * create_tree_node(char id, struct device *parent)