mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 22:54:01 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kay Sievers 2009-01-06 10:44:37 -08:00 committed by Greg Kroah-Hartman
parent 94b324864e
commit 35f74fcab1
4 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/spi/spi.c
View file

@ -47,7 +47,7 @@ modalias_show(struct device *dev, struct device_attribute *a, char *buf)
{ {
const struct spi_device *spi = to_spi_device(dev); const struct spi_device *spi = to_spi_device(dev);
return snprintf(buf, BUS_ID_SIZE + 1, "%s\n", spi->modalias); return sprintf(buf, "%s\n", spi->modalias);
} }
static struct device_attribute spi_dev_attrs[] = { static struct device_attribute spi_dev_attrs[] = {
@ -63,7 +63,7 @@ static int spi_match_device(struct device *dev, struct device_driver *drv)
{ {
const struct spi_device *spi = to_spi_device(dev); const struct spi_device *spi = to_spi_device(dev);
return strncmp(spi->modalias, drv->name, BUS_ID_SIZE) == 0; return strcmp(spi->modalias, drv->name) == 0;
} }
static int spi_uevent(struct device *dev, struct kobj_uevent_env *env) static int spi_uevent(struct device *dev, struct kobj_uevent_env *env)
@ -243,8 +243,7 @@ int spi_add_device(struct spi_device *spi)
} }
/* Set the bus ID string */ /* Set the bus ID string */
snprintf(spi->dev.bus_id, sizeof spi->dev.bus_id, dev_set_name(&spi->dev, "%s.%u", dev_name(&spi->master->dev),
"%s.%u", spi->master->dev.bus_id,
spi->chip_select); spi->chip_select);
@ -254,7 +253,7 @@ int spi_add_device(struct spi_device *spi)
*/ */
mutex_lock(&spi_add_lock); mutex_lock(&spi_add_lock);
if (bus_find_device_by_name(&spi_bus_type, NULL, spi->dev.bus_id) if (bus_find_device_by_name(&spi_bus_type, NULL, dev_name(&spi->dev))
!= NULL) { != NULL) {
dev_err(dev, "chipselect %d already in use\n", dev_err(dev, "chipselect %d already in use\n",
spi->chip_select); spi->chip_select);
@ -269,7 +268,7 @@ int spi_add_device(struct spi_device *spi)
status = spi->master->setup(spi); status = spi->master->setup(spi);
if (status < 0) { if (status < 0) {
dev_err(dev, "can't %s %s, status %d\n", dev_err(dev, "can't %s %s, status %d\n",
"setup", spi->dev.bus_id, status); "setup", dev_name(&spi->dev), status);
goto done; goto done;
} }
@ -277,9 +276,9 @@ int spi_add_device(struct spi_device *spi)
status = device_add(&spi->dev); status = device_add(&spi->dev);
if (status < 0) if (status < 0)
dev_err(dev, "can't %s %s, status %d\n", dev_err(dev, "can't %s %s, status %d\n",
"add", spi->dev.bus_id, status); "add", dev_name(&spi->dev), status);
else else
dev_dbg(dev, "registered child %s\n", spi->dev.bus_id); dev_dbg(dev, "registered child %s\n", dev_name(&spi->dev));
done: done:
mutex_unlock(&spi_add_lock); mutex_unlock(&spi_add_lock);
@ -504,12 +503,11 @@ int spi_register_master(struct spi_master *master)
/* register the device, then userspace will see it. /* register the device, then userspace will see it.
* registration fails if the bus ID is in use. * registration fails if the bus ID is in use.
*/ */
snprintf(master->dev.bus_id, sizeof master->dev.bus_id, dev_set_name(&master->dev, "spi%u", master->bus_num);
"spi%u", master->bus_num);
status = device_add(&master->dev); status = device_add(&master->dev);
if (status < 0) if (status < 0)
goto done; goto done;
dev_dbg(dev, "registered master %s%s\n", master->dev.bus_id, dev_dbg(dev, "registered master %s%s\n", dev_name(&master->dev),
dynamic ? " (dynamic)" : ""); dynamic ? " (dynamic)" : "");
/* populate children from any spi device tables */ /* populate children from any spi device tables */

2
drivers/spi/spi_bitbang.c
View file

@ -475,7 +475,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)
/* this task is the only thing to touch the SPI bits */ /* this task is the only thing to touch the SPI bits */
bitbang->busy = 0; bitbang->busy = 0;
bitbang->workqueue = create_singlethread_workqueue( bitbang->workqueue = create_singlethread_workqueue(
bitbang->master->dev.parent->bus_id); dev_name(bitbang->master->dev.parent));
if (bitbang->workqueue == NULL) { if (bitbang->workqueue == NULL) {
status = -EBUSY; status = -EBUSY;
goto err1; goto err1;

2
drivers/spi/spi_butterfly.c
View file

@ -287,7 +287,7 @@ static void butterfly_attach(struct parport *p)
pp->dataflash = spi_new_device(pp->bitbang.master, &pp->info[0]); pp->dataflash = spi_new_device(pp->bitbang.master, &pp->info[0]);
if (pp->dataflash) if (pp->dataflash)
pr_debug("%s: dataflash at %s\n", p->name, pr_debug("%s: dataflash at %s\n", p->name,
pp->dataflash->dev.bus_id); dev_name(&pp->dataflash->dev));
// dev_info(_what?_, ...) // dev_info(_what?_, ...)
pr_info("%s: AVR Butterfly\n", p->name); pr_info("%s: AVR Butterfly\n", p->name);

2
drivers/spi/spi_lm70llp.c
View file

@ -287,7 +287,7 @@ static void spi_lm70llp_attach(struct parport *p)
pp->spidev_lm70 = spi_new_device(pp->bitbang.master, &pp->info); pp->spidev_lm70 = spi_new_device(pp->bitbang.master, &pp->info);
if (pp->spidev_lm70) if (pp->spidev_lm70)
dev_dbg(&pp->spidev_lm70->dev, "spidev_lm70 at %s\n", dev_dbg(&pp->spidev_lm70->dev, "spidev_lm70 at %s\n",
pp->spidev_lm70->dev.bus_id); dev_name(&pp->spidev_lm70->dev));
else { else {
printk(KERN_WARNING "%s: spi_new_device failed\n", DRVNAME); printk(KERN_WARNING "%s: spi_new_device failed\n", DRVNAME);
status = -ENODEV; status = -ENODEV;