Skip to contentSkip to conversation

USB: make devnode() callback in usb_class_driver take a const *

PATCH In review Greg Kroah-Hartman 4 participants 4 messages Oct 1, 2022 – Oct 11, 2022

Subsystems (5)
lore
Share & tools
lore

Greg Kroah-Hartman

author maintainer
#0 lore raw

PATCH 1/1 USB: make devnode() callback in usb_class_driver take a const *

With the changes to the driver core to make more pointers const, the USB subsystem also needs to be modified to take a const * for the devnode callback so that the driver core's constant pointer will also be properly propagated.

Cc Jiri Kosina <[email protected]>
Cc Benjamin Tissoires <[email protected]>
Cc Pete Zaitcev <[email protected]>
Cc Juergen Stuber <[email protected]>
Cc Johan Hovold <[email protected]>
---
 drivers/hid/usbhid/hiddev.c     | 2 +-
 drivers/usb/class/usblp.c       | 2 +-
 drivers/usb/misc/iowarrior.c    | 2 +-
 drivers/usb/misc/legousbtower.c | 2 +-
 include/linux/usb.h             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
drivers/hid/usbhid/hiddev.c +1 -1
index 2fb2991dbe4c..59cf3ddfdf78 100644
@@ -857,7 +857,7 @@ static const struct file_operations hiddev_fops = {
 	.llseek		= noop_llseek,
 };
 
-static char *hiddev_devnode(struct device *dev, umode_t *mode)
+static char *hiddev_devnode(const struct device *dev, umode_t *mode)
 {
 	return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
 }
drivers/usb/class/usblp.c +1 -1
index f27b4aecff3d..5a2e43331064 100644
@@ -1090,7 +1090,7 @@ static const struct file_operations usblp_fops = {
 	.llseek =	noop_llseek,
 };
 
-static char *usblp_devnode(struct device *dev, umode_t *mode)
+static char *usblp_devnode(const struct device *dev, umode_t *mode)
 {
 	return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
 }
drivers/usb/misc/iowarrior.c +1 -1
index 988a8c02e7e2..f9427a67789c 100644
@@ -717,7 +717,7 @@ static const struct file_operations iowarrior_fops = {
 	.llseek = noop_llseek,
 };
 
-static char *iowarrior_devnode(struct device *dev, umode_t *mode)
+static char *iowarrior_devnode(const struct device *dev, umode_t *mode)
 {
 	return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
 }
drivers/usb/misc/legousbtower.c +1 -1
index 1c9e09138c10..379cf01a6e96 100644
@@ -245,7 +245,7 @@ static const struct file_operations tower_fops = {
 	.llseek =	tower_llseek,
 };
 
-static char *legousbtower_devnode(struct device *dev, umode_t *mode)
+static char *legousbtower_devnode(const struct device *dev, umode_t *mode)
 {
 	return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
 }
include/linux/usb.h +1 -1
index 9ff1ad4dfad1..316e0a6b50e2 100644
@@ -1272,7 +1272,7 @@ struct usb_device_driver {
  */
 struct usb_class_driver {
 	char *name;
-	char *(*devnode)(struct device *dev, umode_t *mode);
+	char *(*devnode)(const struct device *dev, umode_t *mode);
 	const struct file_operations *fops;
 	int minor_base;
 };
Signature · 1 line
2.37.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Greg Kroah-Hartman

With the changes to the driver core to make more pointers const, the USB subsystem also needs to be modified to take a const * for the devnode callback so that the driver core's constant pointer will also be properly propagated.

Cc Jiri Kosina <[email protected]>
Cc Benjamin Tissoires <[email protected]>
Cc Pete Zaitcev <[email protected]>
Cc Juergen Stuber <[email protected]>
Cc Johan Hovold <[email protected]>
Quoted 7 lines
---
 drivers/hid/usbhid/hiddev.c     | 2 +-
 drivers/usb/class/usblp.c       | 2 +-
 drivers/usb/misc/iowarrior.c    | 2 +-
 drivers/usb/misc/legousbtower.c | 2 +-
 include/linux/usb.h             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

Looks correct and complete.

maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Greg Kroah-Hartman
Quoted 5 lines · Greg Kroah-Hartman

With the changes to the driver core to make more pointers const, the USB subsystem also needs to be modified to take a const * for the devnode callback so that the driver core's constant pointer will also be properly propagated.

Quoted 8 lines
Cc Jiri Kosina <[email protected]>
Cc Benjamin Tissoires <[email protected]>
Cc Pete Zaitcev <[email protected]>
Cc Juergen Stuber <[email protected]>
Cc Johan Hovold <[email protected]>
---
 drivers/hid/usbhid/hiddev.c     | 2 +-

For hiddev.c:

Thanks,

Signature · 2 lines
Jiri Kosina
SUSE Labs
maintainer Acked-by on v1 1/1
#3 lore raw
In reply to Greg Kroah-Hartman

drivers/usb/class/usblp.c static const struct file_operations usblp_fops = { · line 1093

Quoted 7 lines · On Sat, 1 Oct 2022 18:51:28 +0200 Greg Kroah-Hartman…

+++ b/drivers/usb/class/usblp.c

drivers/usb/class/usblp.c +1 -1
@@ -1090,7 +1090,7 @@ static const struct file_operations usblp_fops = {
-static char *usblp_devnode(struct device *dev, umode_t *mode)
+static char *usblp_devnode(const struct device *dev, umode_t *mode)
 {
 	return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
 }

Seems obvious.

-- P