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

Commit 1692713e authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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



Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
parent 65a212dd

drivers/sh/maple/maple.c

+4 −4
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static void maple_attach_driver(struct maple_device *mdev) 
		/* Do this silently - as not a real device */

		function = 0;

		mdev->driver = &maple_dummy_driver;

		sprintf(mdev->dev.bus_id, "%d:0.port", mdev->port);

		dev_set_name(&mdev->dev, "%d:0.port", mdev->port);

	} else {

		printk(KERN_INFO

			"Maple bus at (%d, %d): Function 0x%lX\n",
@@ -440,7 +440,7 @@ static void maple_attach_driver(struct maple_device *mdev) 
				"No maple driver found.\n");

			mdev->driver = &maple_dummy_driver;

		}

		sprintf(mdev->dev.bus_id, "%d:0%d.%lX", mdev->port,

		dev_set_name(&mdev->dev, "%d:0%d.%lX", mdev->port,

			     mdev->unit, function);

	}

	mdev->function = function;
@@ -780,7 +780,7 @@ struct bus_type maple_bus_type = { 
EXPORT_SYMBOL_GPL(maple_bus_type);



static struct device maple_bus = {

	.bus_id = "maple",

	.init_name = "maple",

	.release = maple_bus_release,

};

drivers/sh/superhyway/superhyway.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
static int superhyway_devices;



static struct device superhyway_bus_device = {

	.bus_id = "superhyway",

	.init_name = "superhyway",

};



static void superhyway_device_release(struct device *dev)
@@ -83,7 +83,7 @@ int superhyway_add_device(unsigned long base, struct superhyway_device *sdev, 
	dev->id.id		= dev->vcr.mod_id;



	sprintf(dev->name, "SuperHyway device %04x", dev->id.id);

	sprintf(dev->dev.bus_id, "%02x", superhyway_devices);

	dev_set_name(&dev->dev, "%02x", superhyway_devices);



	superhyway_devices++;