Skip to contentSkip to conversation

USB: usbip: convert platform driver to use dev_groups

PATCH In review Greg Kroah-Hartman 2 participants 3 messages Aug 5, 2019 – Aug 6, 2019

Subsystems (2)
lore
Share & tools
lore

Greg Kroah-Hartman

author maintainer
#0 lore raw

PATCH 1/1 USB: usbip: convert platform driver to use dev_groups

Platform drivers now have the option to have the platform core create and remove any needed sysfs attribute files. So take advantage of that and do not register "by hand" any sysfs files.

Cc Valentina Manea <[email protected]>
Cc Shuah Khan <[email protected]>
---
 drivers/usb/usbip/vudc.h       | 2 +-
 drivers/usb/usbip/vudc_dev.c   | 9 ---------
 drivers/usb/usbip/vudc_main.c  | 1 +
 drivers/usb/usbip/vudc_sysfs.c | 7 ++++++-
 4 files changed, 8 insertions(+), 11 deletions(-)
drivers/usb/usbip/vudc.h +1 -1
index cf968192e59f..1bd4bc005829 100644
@@ -115,7 +115,7 @@ struct vudc_device {
 	struct list_head dev_entry;
 };
 
-extern const struct attribute_group vudc_attr_group;
+extern const struct attribute_group *vudc_groups[];
 
 /* visible everywhere */
 
drivers/usb/usbip/vudc_dev.c +0 -9
index a72c17ff1c6a..c8eeabdd9b56 100644
@@ -616,18 +616,10 @@ int vudc_probe(struct platform_device *pdev)
 	if (ret < 0)
 		goto err_add_udc;
 
-	ret = sysfs_create_group(&pdev->dev.kobj, &vudc_attr_group);
-	if (ret) {
-		dev_err(&udc->pdev->dev, "create sysfs files\n");
-		goto err_sysfs;
-	}
-
 	platform_set_drvdata(pdev, udc);
 
 	return ret;
 
-err_sysfs:
-	usb_del_gadget_udc(&udc->gadget);
 err_add_udc:
 	cleanup_vudc_hw(udc);
 err_init_vudc_hw:
@@ -640,7 +632,6 @@ int vudc_remove(struct platform_device *pdev)
 {
 	struct vudc *udc = platform_get_drvdata(pdev);
 
-	sysfs_remove_group(&pdev->dev.kobj, &vudc_attr_group);
 	usb_del_gadget_udc(&udc->gadget);
 	cleanup_vudc_hw(udc);
 	kfree(udc);
drivers/usb/usbip/vudc_main.c +1 -0
index 390733e6937e..678faa82598c 100644
@@ -22,6 +22,7 @@ static struct platform_driver vudc_driver = {
 	.remove		= vudc_remove,
 	.driver		= {
 		.name	= GADGET_NAME,
+		.dev_groups = vudc_groups,
 	},
 };
 
drivers/usb/usbip/vudc_sysfs.c +6 -1
index 6dcd3ff655c3..100f680c572a 100644
@@ -215,7 +215,12 @@ static struct bin_attribute *dev_bin_attrs[] = {
 	NULL,
 };
 
-const struct attribute_group vudc_attr_group = {
+static const struct attribute_group vudc_attr_group = {
 	.attrs = dev_attrs,
 	.bin_attrs = dev_bin_attrs,
 };
+
+const struct attribute_group *vudc_groups[] = {
+	&vudc_attr_group,
+	NULL,
+};
Signature · 1 line
2.22.0
maintainer Acked-by Shuah Khan on v1 1/1
#1 lore raw
Quoted 79 lines · Greg Kroah-Hartman

Platform drivers now have the option to have the platform core create and remove any needed sysfs attribute files. So take advantage of that and do not register "by hand" any sysfs files.

Cc Valentina Manea <[email protected]>
Cc Shuah Khan <[email protected]>
---
  drivers/usb/usbip/vudc.h       | 2 +-
  drivers/usb/usbip/vudc_dev.c   | 9 ---------
  drivers/usb/usbip/vudc_main.c  | 1 +
  drivers/usb/usbip/vudc_sysfs.c | 7 ++++++-
  4 files changed, 8 insertions(+), 11 deletions(-)
drivers/usb/usbip/vudc.h +1 -1
index cf968192e59f..1bd4bc005829 100644
@@ -115,7 +115,7 @@ struct vudc_device {
  	struct list_head dev_entry;
  };
 
-extern const struct attribute_group vudc_attr_group;
+extern const struct attribute_group *vudc_groups[];
 
  /* visible everywhere */
 
drivers/usb/usbip/vudc_dev.c +0 -9
index a72c17ff1c6a..c8eeabdd9b56 100644
@@ -616,18 +616,10 @@ int vudc_probe(struct platform_device *pdev)
  	if (ret < 0)
  		goto err_add_udc;
 
-	ret = sysfs_create_group(&pdev->dev.kobj, &vudc_attr_group);
-	if (ret) {
-		dev_err(&udc->pdev->dev, "create sysfs files\n");
-		goto err_sysfs;
-	}
-
  	platform_set_drvdata(pdev, udc);
 
  	return ret;
 
-err_sysfs:
-	usb_del_gadget_udc(&udc->gadget);
  err_add_udc:
  	cleanup_vudc_hw(udc);
  err_init_vudc_hw:
@@ -640,7 +632,6 @@ int vudc_remove(struct platform_device *pdev)
  {
  	struct vudc *udc = platform_get_drvdata(pdev);
 
-	sysfs_remove_group(&pdev->dev.kobj, &vudc_attr_group);
  	usb_del_gadget_udc(&udc->gadget);
  	cleanup_vudc_hw(udc);
  	kfree(udc);
drivers/usb/usbip/vudc_main.c +1 -0
index 390733e6937e..678faa82598c 100644
@@ -22,6 +22,7 @@ static struct platform_driver vudc_driver = {
  	.remove		= vudc_remove,
  	.driver		= {
  		.name	= GADGET_NAME,
+		.dev_groups = vudc_groups,
  	},
  };
 
drivers/usb/usbip/vudc_sysfs.c +0 -0
index 6dcd3ff655c3..100f680c572a 100644
@@ -215,7 +215,12 @@ static struct bin_attribute *dev_bin_attrs[] = {
  	NULL,
  };
 

drivers/usb/usbip/vudc_sysfs.c static struct bin_attribute *dev_bin_attrs[] = { · line 226

Quoted 10 lines
drivers/usb/usbip/vudc_sysfs.c +6 -1
-const struct attribute_group vudc_attr_group = {
+static const struct attribute_group vudc_attr_group = {
  	.attrs = dev_attrs,
  	.bin_attrs = dev_bin_attrs,
  };
+
+const struct attribute_group *vudc_groups[] = {
+	&vudc_attr_group,
+	NULL,
+};

Looks good to me.

thanks,
-- Shuah

author maintainer
#2 lore raw
Quoted 84 lines · shuah
Quoted 70 lines · Greg Kroah-Hartman

Platform drivers now have the option to have the platform core create and remove any needed sysfs attribute files. So take advantage of that and do not register "by hand" any sysfs files.

Cc Valentina Manea <[email protected]>
Cc Shuah Khan <[email protected]>
---
  drivers/usb/usbip/vudc.h       | 2 +-
  drivers/usb/usbip/vudc_dev.c   | 9 ---------
  drivers/usb/usbip/vudc_main.c  | 1 +
  drivers/usb/usbip/vudc_sysfs.c | 7 ++++++-
  4 files changed, 8 insertions(+), 11 deletions(-)
drivers/usb/usbip/vudc.h +1 -1
index cf968192e59f..1bd4bc005829 100644
@@ -115,7 +115,7 @@ struct vudc_device {
  	struct list_head dev_entry;
  };
-extern const struct attribute_group vudc_attr_group;
+extern const struct attribute_group *vudc_groups[];
  /* visible everywhere */
drivers/usb/usbip/vudc_dev.c +0 -9
index a72c17ff1c6a..c8eeabdd9b56 100644
@@ -616,18 +616,10 @@ int vudc_probe(struct platform_device *pdev)
  	if (ret < 0)
  		goto err_add_udc;
-	ret = sysfs_create_group(&pdev->dev.kobj, &vudc_attr_group);
-	if (ret) {
-		dev_err(&udc->pdev->dev, "create sysfs files\n");
-		goto err_sysfs;
-	}
-
  	platform_set_drvdata(pdev, udc);
  	return ret;
-err_sysfs:
-	usb_del_gadget_udc(&udc->gadget);
  err_add_udc:
  	cleanup_vudc_hw(udc);
  err_init_vudc_hw:
@@ -640,7 +632,6 @@ int vudc_remove(struct platform_device *pdev)
  {
  	struct vudc *udc = platform_get_drvdata(pdev);
-	sysfs_remove_group(&pdev->dev.kobj, &vudc_attr_group);
  	usb_del_gadget_udc(&udc->gadget);
  	cleanup_vudc_hw(udc);
  	kfree(udc);
drivers/usb/usbip/vudc_main.c +1 -0
index 390733e6937e..678faa82598c 100644
@@ -22,6 +22,7 @@ static struct platform_driver vudc_driver = {
  	.remove		= vudc_remove,
  	.driver		= {
  		.name	= GADGET_NAME,
+		.dev_groups = vudc_groups,
  	},
  };
drivers/usb/usbip/vudc_sysfs.c +0 -1
index 6dcd3ff655c3..100f680c572a 100644
@@ -215,7 +215,12 @@ static struct bin_attribute *dev_bin_attrs[] = {
  	NULL,
  };
-const struct attribute_group vudc_attr_group = {

drivers/usb/usbip/vudc_sysfs.c static struct bin_attribute *dev_bin_attrs[] = { · line 226

Quoted 10 lines
drivers/usb/usbip/vudc_sysfs.c +6 -0
+static const struct attribute_group vudc_attr_group = {
  	.attrs = dev_attrs,
  	.bin_attrs = dev_bin_attrs,
  };
+
+const struct attribute_group *vudc_groups[] = {
+	&vudc_attr_group,
+	NULL,
+};
 

Looks good to me.

Quoted 1 line

Thanks for the review!

greg k-h