Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35f74fca authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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



Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 94b32486

drivers/spi/spi.c

+9 −11
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ modalias_show(struct device *dev, struct device_attribute *a, char *buf) 
{

	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[] = {
@@ -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);



	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)
@@ -243,8 +243,7 @@ int spi_add_device(struct spi_device *spi) 
	}



	/* Set the bus ID string */

	snprintf(spi->dev.bus_id, sizeof spi->dev.bus_id,

			"%s.%u", spi->master->dev.bus_id,

	dev_set_name(&spi->dev, "%s.%u", dev_name(&spi->master->dev),

			spi->chip_select);
@@ -254,7 +253,7 @@ int spi_add_device(struct spi_device *spi) 
	 */

	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) {

		dev_err(dev, "chipselect %d already in use\n",

				spi->chip_select);
@@ -269,7 +268,7 @@ int spi_add_device(struct spi_device *spi) 
	status = spi->master->setup(spi);

	if (status < 0) {

		dev_err(dev, "can't %s %s, status %d\n",

				"setup", spi->dev.bus_id, status);

				"setup", dev_name(&spi->dev), status);

		goto done;

	}
@@ -277,9 +276,9 @@ int spi_add_device(struct spi_device *spi) 
	status = device_add(&spi->dev);

	if (status < 0)

		dev_err(dev, "can't %s %s, status %d\n",

				"add", spi->dev.bus_id, status);

				"add", dev_name(&spi->dev), status);

	else

		dev_dbg(dev, "registered child %s\n", spi->dev.bus_id);

		dev_dbg(dev, "registered child %s\n", dev_name(&spi->dev));



done:

	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.

	 * registration fails if the bus ID is in use.

	 */

	snprintf(master->dev.bus_id, sizeof master->dev.bus_id,

		"spi%u", master->bus_num);

	dev_set_name(&master->dev, "spi%u", master->bus_num);

	status = device_add(&master->dev);

	if (status < 0)

		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)" : "");



	/* populate children from any spi device tables */

drivers/spi/spi_bitbang.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang) 
	/* this task is the only thing to touch the SPI bits */

	bitbang->busy = 0;

	bitbang->workqueue = create_singlethread_workqueue(

			bitbang->master->dev.parent->bus_id);

			dev_name(bitbang->master->dev.parent));

	if (bitbang->workqueue == NULL) {

		status = -EBUSY;

		goto err1;

drivers/spi/spi_butterfly.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static void butterfly_attach(struct parport *p) 
	pp->dataflash = spi_new_device(pp->bitbang.master, &pp->info[0]);

	if (pp->dataflash)

		pr_debug("%s: dataflash at %s\n", p->name,

				pp->dataflash->dev.bus_id);

				dev_name(&pp->dataflash->dev));



	// dev_info(_what?_, ...)

	pr_info("%s: AVR Butterfly\n", p->name);

drivers/spi/spi_lm70llp.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static void spi_lm70llp_attach(struct parport *p) 
	pp->spidev_lm70 = spi_new_device(pp->bitbang.master, &pp->info);

	if (pp->spidev_lm70)

		dev_dbg(&pp->spidev_lm70->dev, "spidev_lm70 at %s\n",

				pp->spidev_lm70->dev.bus_id);

				dev_name(&pp->spidev_lm70->dev));

	else {

		printk(KERN_WARNING "%s: spi_new_device failed\n", DRVNAME);

		status = -ENODEV;