[PATCH] dlm/user.c: static initialization improvements

[Denis Cheng]

also change name_prefix from char pointer to char array.

Signed-off-by: Denis Cheng <[EMAIL PROTECTED]>
---
 fs/dlm/user.c |   13 +++--
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index 4f74154..2cc5415 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -24,8 +24,7 @@
 #include "lvb_table.h"
 #include "user.h"
 
-static const char *name_prefix="dlm";
-static struct miscdevice ctl_device;
+static const char name_prefix[] = "dlm";
 static const struct file_operations device_fops;
 
 #ifdef CONFIG_COMPAT
@@ -896,14 +895,16 @@ static const struct file_operations ctl_device_fops = {
.owner   = THIS_MODULE,
 };
 
+static struct miscdevice ctl_device = {
+   .name  = "dlm-control",
+   .fops  = _device_fops,
+   .minor = MISC_DYNAMIC_MINOR,
+};
+
 int dlm_user_init(void)
 {
int error;
 
-   ctl_device.name = "dlm-control";
-   ctl_device.fops = _device_fops;
-   ctl_device.minor = MISC_DYNAMIC_MINOR;
-
error = misc_register(_device);
if (error)
log_print("misc_register failed for control device");
-- 
1.5.3.8

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] dlm/user.c: static initialization improvements

[Denis Cheng]

also change name_prefix from char pointer to char array.

Signed-off-by: Denis Cheng [EMAIL PROTECTED]
---
 fs/dlm/user.c |   13 +++--
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index 4f74154..2cc5415 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -24,8 +24,7 @@
 #include lvb_table.h
 #include user.h
 
-static const char *name_prefix=dlm;
-static struct miscdevice ctl_device;
+static const char name_prefix[] = dlm;
 static const struct file_operations device_fops;
 
 #ifdef CONFIG_COMPAT
@@ -896,14 +895,16 @@ static const struct file_operations ctl_device_fops = {
.owner   = THIS_MODULE,
 };
 
+static struct miscdevice ctl_device = {
+   .name  = dlm-control,
+   .fops  = ctl_device_fops,
+   .minor = MISC_DYNAMIC_MINOR,
+};
+
 int dlm_user_init(void)
 {
int error;
 
-   ctl_device.name = dlm-control;
-   ctl_device.fops = ctl_device_fops;
-   ctl_device.minor = MISC_DYNAMIC_MINOR;
-
error = misc_register(ctl_device);
if (error)
log_print(misc_register failed for control device);
-- 
1.5.3.8

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/