Skip to contentSkip to conversation

char: make tile-srom explicitly non-modular

PATCH New Paul Gortmaker 3 participants 4 messages Oct 31, 2016 – Nov 10, 2016 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 char: make tile-srom explicitly non-modular

The Kconfig currently controlling compilation of this code is:

drivers/char/Kconfig:config TILE_SROM
drivers/char/Kconfig: bool "Character-device access via hypervisor to the Tilera SPI ROM"

...meaning that it currently is not being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit.

We also delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments.

We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments.

We leave the moduleparam.h since the file does declare some variables via module_param().

Cc Arnd Bergmann <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Chris Metcalf <[email protected]>
---
 drivers/char/tile-srom.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)
drivers/char/tile-srom.c +1 -19
index 69f6b4acc377..d7ae84b1930e 100644
@@ -18,7 +18,6 @@
  * Greg Kroah-Hartman, published by O'Reilly Media, Inc.
  */
 
-#include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>	/* printk() */
 #include <linux/slab.h>		/* kmalloc() */
@@ -70,8 +69,6 @@ struct srom_dev {
 
 static int srom_major;			/* Dynamic major by default */
 module_param(srom_major, int, 0);
-MODULE_AUTHOR("Tilera Corporation");
-MODULE_LICENSE("GPL");
 
 static int srom_devs;			/* Number of SROM partitions */
 static struct cdev srom_cdev;
@@ -454,19 +451,4 @@ fail_mem:
 	kfree(srom_devices);
 	return result;
 }
-
-/** srom_cleanup() - Clean up the driver's module. */
-static void srom_cleanup(void)
-{
-	int i;
-	for (i = 0; i < srom_devs; i++)
-		device_destroy(srom_class, MKDEV(srom_major, i));
-	class_destroy(srom_class);
-	cdev_del(&srom_cdev);
-	platform_device_unregister(srom_parent);
-	unregister_chrdev_region(MKDEV(srom_major, 0), srom_devs);
-	kfree(srom_devices);
-}
-
-module_init(srom_init);
-module_exit(srom_cleanup);
+device_initcall(srom_init);
Signature · 1 line
2.8.4
#1 lore raw

PATCH 1/1 tile-srom: allow the driver to be built as a module

The code was already configured that way, but the Kconfig file didn't support requesting it.

A buglet caused a null pointer deref when unloading the module, but this commit also corrects that issue.

---
This is in response to Paul's patch (see the in-reply-to) suggesting we remove the module infrastructure from the code instead.

I can push this via the tile tree since it's a tile-only device, or Greg, if you'd prefer to take it via your tree, that's fine too.

 drivers/char/Kconfig     | 2 +-
 drivers/char/tile-srom.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/char/Kconfig +1 -1
index dcc09739a54e..70124ca5c33d 100644
@@ -578,7 +578,7 @@ config DEVPORT
 source "drivers/s390/char/Kconfig"
 
 config TILE_SROM
-	bool "Character-device access via hypervisor to the Tilera SPI ROM"
+	tristate "Character-device access via hypervisor to the Tilera SPI ROM"
 	depends on TILE
 	default y
 	---help---
drivers/char/tile-srom.c +2 -1
index 398800edb2cc..3d4cca64b2d4 100644
@@ -312,7 +312,8 @@ ATTRIBUTE_GROUPS(srom_dev);
 
 static char *srom_devnode(struct device *dev, umode_t *mode)
 {
-	*mode = S_IRUGO | S_IWUSR;
+	if (mode)
+		*mode = 0644;
 	return kasprintf(GFP_KERNEL, "srom/%s", dev_name(dev));
 }
 
Signature · 1 line
2.7.2
#2 lore raw

Re: [PATCH] tile-srom: allow the driver to be built as a module

Quoted 10 lines · [[PATCH] tile-srom: allow the driver to be built as a module] On 07/11/2016…

The code was already configured that way, but the Kconfig file didn't support requesting it.

A buglet caused a null pointer deref when unloading the module, but this commit also corrects that issue.

---
This is in response to Paul's patch (see the in-reply-to) suggesting we remove the module infrastructure from the code instead.

Fine by me; I have to default to keeping the code consistent with the way it used to be, but people who want modular use cases and can test those are welcome to extend the functionality accordingly. In the end I just want the code to be consistent with the Makefile/Kconfig.

Thanks,
Paul.
--

Quoted 38 lines

I can push this via the tile tree since it's a tile-only device, or Greg, if you'd prefer to take it via your tree, that's fine too.

 drivers/char/Kconfig     | 2 +-
 drivers/char/tile-srom.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/char/Kconfig +1 -1
index dcc09739a54e..70124ca5c33d 100644
@@ -578,7 +578,7 @@ config DEVPORT
 source "drivers/s390/char/Kconfig"
 
 config TILE_SROM
-	bool "Character-device access via hypervisor to the Tilera SPI ROM"
+	tristate "Character-device access via hypervisor to the Tilera SPI ROM"
 	depends on TILE
 	default y
 	---help---
drivers/char/tile-srom.c +2 -1
index 398800edb2cc..3d4cca64b2d4 100644
@@ -312,7 +312,8 @@ ATTRIBUTE_GROUPS(srom_dev);
 
 static char *srom_devnode(struct device *dev, umode_t *mode)
 {
-	*mode = S_IRUGO | S_IWUSR;
+	if (mode)
+		*mode = 0644;
 	return kasprintf(GFP_KERNEL, "srom/%s", dev_name(dev));
 }
 
Signature · 1 line
2.7.2
#3 lore raw

Re: [PATCH] tile-srom: allow the driver to be built as a module

In reply to Chris Metcalf
Quoted 6 lines · Chris Metcalf

The code was already configured that way, but the Kconfig file didn't support requesting it.

A buglet caused a null pointer deref when unloading the module, but this commit also corrects that issue.

Quoted 7 lines

---
This is in response to Paul's patch (see the in-reply-to) suggesting we remove the module infrastructure from the code instead.

I can push this via the tile tree since it's a tile-only device, or Greg, if you'd prefer to take it via your tree, that's fine too.

I'll take it in mine, that's easy enough...

thanks,

greg k-h