Commit a6c2490f authored by Kay Sievers's avatar Kay Sievers Committed by Dmitry Torokhov
Browse files

Input: 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>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent dde4ac07

drivers/input/evbug.c

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ MODULE_LICENSE("GPL"); 
static void evbug_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)

{

	printk(KERN_DEBUG "evbug.c: Event. Dev: %s, Type: %d, Code: %d, Value: %d\n",

		handle->dev->dev.bus_id, type, code, value);

		dev_name(&handle->dev->dev), type, code, value);

}



static int evbug_connect(struct input_handler *handler, struct input_dev *dev,
@@ -65,7 +65,7 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev, 
		goto err_unregister_handle;



	printk(KERN_DEBUG "evbug.c: Connected device: %s (%s at %s)\n",

		dev->dev.bus_id,

		dev_name(&dev->dev),

		dev->name ?: "unknown",

		dev->phys ?: "unknown");
@@ -81,7 +81,7 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev, 
static void evbug_disconnect(struct input_handle *handle)

{

	printk(KERN_DEBUG "evbug.c: Disconnected device: %s\n",

		handle->dev->dev.bus_id);

		dev_name(&handle->dev->dev));



	input_close_device(handle);

	input_unregister_handle(handle);

drivers/input/evdev.c

+1 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ static int evdev_connect(struct input_handler *handler, struct input_dev *dev, 
	evdev->handle.handler = handler;

	evdev->handle.private = evdev;



	strlcpy(evdev->dev.bus_id, evdev->name, sizeof(evdev->dev.bus_id));

	dev_set_name(&evdev->dev, evdev->name);

	evdev->dev.devt = MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor);

	evdev->dev.class = &input_class;

	evdev->dev.parent = &dev->dev;

drivers/input/gameport/gameport.c

+1 −2
Original line number Diff line number Diff line
@@ -530,8 +530,7 @@ static void gameport_init_port(struct gameport *gameport) 


	mutex_init(&gameport->drv_mutex);

	device_initialize(&gameport->dev);

	snprintf(gameport->dev.bus_id, sizeof(gameport->dev.bus_id),

		 "gameport%lu", (unsigned long)atomic_inc_return(&gameport_no) - 1);

	dev_set_name(&gameport->dev, "gameport%lu", (unsigned long)atomic_inc_return(&gameport_no) - 1);

	gameport->dev.bus = &gameport_bus;

	gameport->dev.release = gameport_release_port;

	if (gameport->parent)

drivers/input/gameport/ns558.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int ns558_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *did) 
	ns558->gameport = port;



	gameport_set_name(port, "NS558 PnP Gameport");

	gameport_set_phys(port, "pnp%s/gameport0", dev->dev.bus_id);

	gameport_set_phys(port, "pnp%s/gameport0", dev_name(&dev->dev));

	port->dev.parent = &dev->dev;

	port->io = ioport;

drivers/input/input.c

+2 −2
Original line number Diff line number Diff line
@@ -1389,8 +1389,8 @@ int input_register_device(struct input_dev *dev) 
	if (!dev->setkeycode)

		dev->setkeycode = input_default_setkeycode;



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

		 "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1);

	dev_set_name(&dev->dev, "input%ld",

		     (unsigned long) atomic_inc_return(&input_no) - 1);



	error = device_add(&dev->dev);

	if (error)