input: struct device - replace bus_id with dev_name(), dev_set_name()
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
From: Kay Sievers <[email protected]>
Subject: input: struct device - replace bus_id with dev_name(), dev_set_name()
---
drivers/input/evbug.c +3 -3
@@ -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
@@ -1001,7 +1001,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
@@ -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
@@ -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
@@ -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)
drivers/input/joydev.c +1 -1
@@ -801,7 +801,7 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev, } } -strlcpy (joydev->dev.bus_id, joydev->name,sizeof (joydev->dev.bus_id)); +dev_set_name (&joydev->dev, joydev->name); joydev->dev.devt =MKDEV (INPUT_MAJOR ,JOYDEV_MINOR_BASE + minor); joydev->dev.class = &input_class; joydev->dev.parent = &dev->dev;
drivers/input/mousedev.c +1 -2
@@ -879,8 +879,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev, mousedev->handle.handler = handler; mousedev->handle.private = mousedev; -strlcpy (mousedev->dev.bus_id, mousedev->name, -sizeof (mousedev->dev.bus_id)); +dev_set_name (&mousedev->dev, mousedev->name); mousedev->dev.class = &input_class;if (dev) mousedev->dev.parent = &dev->dev;
drivers/input/serio/pcips2.c +1 -1
@@ -153,7 +153,7 @@ static int __devinit pcips2_probe(struct pci_dev *dev, const struct pci_device_i serio->open = pcips2_open; serio->close = pcips2_close;strlcpy (serio->name,pci_name (dev),sizeof (serio->name)); -strlcpy (serio->phys, dev->dev.bus_id,sizeof (serio->phys)); +strlcpy (serio->phys,dev_name (&dev->dev),sizeof (serio->phys)); serio->port_data = ps2if; serio->dev.parent = &dev->dev; ps2if->io = serio;
drivers/input/serio/serio.c +1 -2
@@ -546,8 +546,7 @@ static void serio_init_port(struct serio *serio)spin_lock_init (&serio->lock);mutex_init (&serio->drv_mutex);device_initialize (&serio->dev); -snprintf (serio->dev.bus_id,sizeof (serio->dev.bus_id), -"serio%ld" , (long )atomic_inc_return (&serio_no) -1 ); +dev_set_name (&serio->dev,"serio%ld" , (long )atomic_inc_return (&serio_no) -1 ); serio->dev.bus = &serio_bus; serio->dev.release = serio_release_port;if (serio->parent) {
drivers/input/touchscreen/ads7846.c +2 -2
@@ -559,7 +559,7 @@ static void ads7846_rx(void *ads)if (packet->tc.ignore || Rt > ts->pressure_max) {#ifdef VERBOSE pr_debug ("%s: ignored %d pressure %d\n" , - ts->spi->dev.bus_id, packet->tc.ignore, Rt); +dev_name (&ts->spi->dev), packet->tc.ignore, Rt);#endif hrtimer_start (&ts->timer,ktime_set (0 ,TS_POLL_PERIOD ),HRTIMER_MODE_REL );
@@ -947,7 +947,7 @@ static int __devinit ads7846_probe(struct spi_device *spi) ts->penirq_recheck_delay_usecs = pdata->penirq_recheck_delay_usecs; -snprintf (ts->phys,sizeof (ts->phys),"%s/input0" , spi->dev.bus_id); +snprintf (ts->phys,sizeof (ts->phys),"%s/input0" ,dev_name (&spi->dev)); input_dev->name ="ADS784x Touchscreen" ; input_dev->phys = ts->phys;