char: Convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index d784650d14f0d113c5d852e47d9dd676741e3b4f..448ce5e29c561bcf4fb8d1a6d3013fb6339e69be 100644 (file)
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -725,7 +725,7 @@ static int hpet_is_known(struct hpet_data *hdp)
        return 0;
 }
 
-static ctl_table hpet_table[] = {
+static struct ctl_table hpet_table[] = {
        {
         .procname = "max-user-freq",
         .data = &hpet_max_freq,
@@ -736,7 +736,7 @@ static ctl_table hpet_table[] = {
        {}
 };
 
-static ctl_table hpet_root[] = {
+static struct ctl_table hpet_root[] = {
        {
         .procname = "hpet",
         .maxlen = 0,
@@ -746,7 +746,7 @@ static ctl_table hpet_root[] = {
        {}
 };
 
-static ctl_table dev_root[] = {
+static struct ctl_table dev_root[] = {
        {
         .procname = "dev",
         .maxlen = 0,

diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c
index 2efa176beab0b2a765b3fe5e01dfb08c13706455..9f2e3be2c5b8b37d059d9aca5d2f4677753ce034 100644 (file)
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
@@ -659,7 +659,7 @@ static struct ipmi_smi_watcher smi_watcher = {
 #ifdef CONFIG_PROC_FS
 #include <linux/sysctl.h>
 
-static ctl_table ipmi_table[] = {
+static struct ctl_table ipmi_table[] = {
        { .procname     = "poweroff_powercycle",
          .data         = &poweroff_powercycle,
          .maxlen       = sizeof(poweroff_powercycle),
@@ -668,14 +668,14 @@ static ctl_table ipmi_table[] = {
        { }
 };
 
-static ctl_table ipmi_dir_table[] = {
+static struct ctl_table ipmi_dir_table[] = {
        { .procname     = "ipmi",
          .mode         = 0555,
          .child        = ipmi_table },
        { }
 };
 
-static ctl_table ipmi_root_table[] = {
+static struct ctl_table ipmi_root_table[] = {
        { .procname     = "dev",
          .mode         = 0555,
          .child        = ipmi_dir_table },

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 35487e8ded59f106e3a7b157aa3d5bf46f9579e8..0d91fe52f3f5eee10397563361a4b1dd1579e8cf 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1381,10 +1381,10 @@ static char sysctl_bootid[16];
  * as an ASCII string in the standard UUID format.  If accesses via the
  * sysctl system call, it is returned as 16 bytes of binary data.
  */
-static int proc_do_uuid(ctl_table *table, int write,
+static int proc_do_uuid(struct ctl_table *table, int write,
                        void __user *buffer, size_t *lenp, loff_t *ppos)
 {
-       ctl_table fake_table;
+       struct ctl_table fake_table;
        unsigned char buf[64], tmp_uuid[16], *uuid;
 
        uuid = table->data;
@@ -1409,8 +1409,8 @@ static int proc_do_uuid(ctl_table *table, int write,
 }
 
 static int sysctl_poolsize = INPUT_POOL_WORDS * 32;
-extern ctl_table random_table[];
-ctl_table random_table[] = {
+extern struct ctl_table random_table[];
+struct ctl_table random_table[] = {
        {
                .procname       = "poolsize",
                .data           = &sysctl_poolsize,

diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 91470fdbab2a578610e4269e88a959e6694c6ef6..c0cbbd429bdc7abcf0d3055404224bff7d367196 100644 (file)
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -280,7 +280,7 @@ static irqreturn_t rtc_interrupt(int irq, void *dev_id)
 /*
  * sysctl-tuning infrastructure.
  */
-static ctl_table rtc_table[] = {
+static struct ctl_table rtc_table[] = {
        {
                .procname       = "max-user-freq",
                .data           = &rtc_max_user_freq,
@@ -291,7 +291,7 @@ static ctl_table rtc_table[] = {
        { }
 };
 
-static ctl_table rtc_root[] = {
+static struct ctl_table rtc_root[] = {
        {
                .procname       = "rtc",
                .mode           = 0555,
@@ -300,7 +300,7 @@ static ctl_table rtc_root[] = {
        { }
 };
 
-static ctl_table dev_root[] = {
+static struct ctl_table dev_root[] = {
        {
                .procname       = "dev",
                .mode           = 0555,