cdev: remove unneeded setting of cdev names

struct cdev does not need the kobject name to be set, as it is never
used.  This patch fixes up the few places it is set.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/block/bsg.c b/block/bsg.c
index ed264682723465793f0c947143e4a9fcd7ed5c93..b8ddfc66f210aac023479291a95ea1627f396950 100644 (file)
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -1010,10 +1010,7 @@ unlock:
 }
 EXPORT_SYMBOL_GPL(bsg_register_queue);
 
-static struct cdev bsg_cdev = {
-       .kobj   = {.name = "bsg", },
-       .owner  = THIS_MODULE,
-};
+static struct cdev bsg_cdev;
 
 static int __init bsg_init(void)
 {

diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 1f0d7c60c94420fb98fd23791bc38ba1b8266b37..bbfa0e241cba38928c8a5b5157a7a2a3ac178d2a 100644 (file)
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -255,10 +255,7 @@ static const struct file_operations raw_ctl_fops = {
        .owner  =       THIS_MODULE,
 };
 
-static struct cdev raw_cdev = {
-       .kobj   =       {.name = "raw", },
-       .owner  =       THIS_MODULE,
-};
+static struct cdev raw_cdev;
 
 static int __init raw_init(void)
 {

diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 56231d8edc079a5306a3a487bdf04373db83b757..18738faecbbc51adc7f9311c066779cafdee0b88 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -103,10 +103,7 @@ static struct file_operations dvb_device_fops =
        .open =         dvb_device_open,
 };
 
-static struct cdev dvb_device_cdev = {
-       .kobj   = {.name = "dvb", },
-       .owner  =       THIS_MODULE,
-};
+static struct cdev dvb_device_cdev;
 
 int dvb_generic_open(struct inode *inode, struct file *file)
 {

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 927a181120a9123311313abaa6c58a1f34484048..fe98796d2ff1bb1847838b453c10bb8898109ccf 100644 (file)
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1576,6 +1576,7 @@ static unsigned int usbdev_poll(struct file *file, struct poll_table_struct *wai
 }
 
 const struct file_operations usbdev_file_operations = {
+       .owner =        THIS_MODULE,
        .llseek =       usbdev_lseek,
        .read =         usbdev_read,
        .poll =         usbdev_poll,
@@ -1625,10 +1626,7 @@ static struct notifier_block usbdev_nb = {
 };
 #endif
 
-static struct cdev usb_device_cdev = {
-       .kobj   = {.name = "usb_device", },
-       .owner  = THIS_MODULE,
-};
+static struct cdev usb_device_cdev;
 
 int __init usb_devio_init(void)
 {