Commit be424c63 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds

parport: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5eb10d91
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define PARPORT_MIN_SPINTIME_VALUE 1 #define PARPORT_MIN_SPINTIME_VALUE 1
#define PARPORT_MAX_SPINTIME_VALUE 1000 #define PARPORT_MAX_SPINTIME_VALUE 1000
static int do_active_device(ctl_table *table, int write, static int do_active_device(struct ctl_table *table, int write,
void __user *result, size_t *lenp, loff_t *ppos) void __user *result, size_t *lenp, loff_t *ppos)
{ {
struct parport *port = (struct parport *)table->extra1; struct parport *port = (struct parport *)table->extra1;
...@@ -68,7 +68,7 @@ static int do_active_device(ctl_table *table, int write, ...@@ -68,7 +68,7 @@ static int do_active_device(ctl_table *table, int write,
} }
#ifdef CONFIG_PARPORT_1284 #ifdef CONFIG_PARPORT_1284
static int do_autoprobe(ctl_table *table, int write, static int do_autoprobe(struct ctl_table *table, int write,
void __user *result, size_t *lenp, loff_t *ppos) void __user *result, size_t *lenp, loff_t *ppos)
{ {
struct parport_device_info *info = table->extra2; struct parport_device_info *info = table->extra2;
...@@ -110,9 +110,9 @@ static int do_autoprobe(ctl_table *table, int write, ...@@ -110,9 +110,9 @@ static int do_autoprobe(ctl_table *table, int write,
} }
#endif /* IEEE1284.3 support. */ #endif /* IEEE1284.3 support. */
static int do_hardware_base_addr (ctl_table *table, int write, static int do_hardware_base_addr(struct ctl_table *table, int write,
void __user *result, void __user *result,
size_t *lenp, loff_t *ppos) size_t *lenp, loff_t *ppos)
{ {
struct parport *port = (struct parport *)table->extra1; struct parport *port = (struct parport *)table->extra1;
char buffer[20]; char buffer[20];
...@@ -138,9 +138,9 @@ static int do_hardware_base_addr (ctl_table *table, int write, ...@@ -138,9 +138,9 @@ static int do_hardware_base_addr (ctl_table *table, int write,
return copy_to_user(result, buffer, len) ? -EFAULT : 0; return copy_to_user(result, buffer, len) ? -EFAULT : 0;
} }
static int do_hardware_irq (ctl_table *table, int write, static int do_hardware_irq(struct ctl_table *table, int write,
void __user *result, void __user *result,
size_t *lenp, loff_t *ppos) size_t *lenp, loff_t *ppos)
{ {
struct parport *port = (struct parport *)table->extra1; struct parport *port = (struct parport *)table->extra1;
char buffer[20]; char buffer[20];
...@@ -166,9 +166,9 @@ static int do_hardware_irq (ctl_table *table, int write, ...@@ -166,9 +166,9 @@ static int do_hardware_irq (ctl_table *table, int write,
return copy_to_user(result, buffer, len) ? -EFAULT : 0; return copy_to_user(result, buffer, len) ? -EFAULT : 0;
} }
static int do_hardware_dma (ctl_table *table, int write, static int do_hardware_dma(struct ctl_table *table, int write,
void __user *result, void __user *result,
size_t *lenp, loff_t *ppos) size_t *lenp, loff_t *ppos)
{ {
struct parport *port = (struct parport *)table->extra1; struct parport *port = (struct parport *)table->extra1;
char buffer[20]; char buffer[20];
...@@ -194,9 +194,9 @@ static int do_hardware_dma (ctl_table *table, int write, ...@@ -194,9 +194,9 @@ static int do_hardware_dma (ctl_table *table, int write,
return copy_to_user(result, buffer, len) ? -EFAULT : 0; return copy_to_user(result, buffer, len) ? -EFAULT : 0;
} }
static int do_hardware_modes (ctl_table *table, int write, static int do_hardware_modes(struct ctl_table *table, int write,
void __user *result, void __user *result,
size_t *lenp, loff_t *ppos) size_t *lenp, loff_t *ppos)
{ {
struct parport *port = (struct parport *)table->extra1; struct parport *port = (struct parport *)table->extra1;
char buffer[40]; char buffer[40];
...@@ -255,11 +255,11 @@ PARPORT_MAX_SPINTIME_VALUE; ...@@ -255,11 +255,11 @@ PARPORT_MAX_SPINTIME_VALUE;
struct parport_sysctl_table { struct parport_sysctl_table {
struct ctl_table_header *sysctl_header; struct ctl_table_header *sysctl_header;
ctl_table vars[12]; struct ctl_table vars[12];
ctl_table device_dir[2]; struct ctl_table device_dir[2];
ctl_table port_dir[2]; struct ctl_table port_dir[2];
ctl_table parport_dir[2]; struct ctl_table parport_dir[2];
ctl_table dev_dir[2]; struct ctl_table dev_dir[2];
}; };
static const struct parport_sysctl_table parport_sysctl_template = { static const struct parport_sysctl_table parport_sysctl_template = {
...@@ -369,12 +369,12 @@ static const struct parport_sysctl_table parport_sysctl_template = { ...@@ -369,12 +369,12 @@ static const struct parport_sysctl_table parport_sysctl_template = {
struct parport_device_sysctl_table struct parport_device_sysctl_table
{ {
struct ctl_table_header *sysctl_header; struct ctl_table_header *sysctl_header;
ctl_table vars[2]; struct ctl_table vars[2];
ctl_table device_dir[2]; struct ctl_table device_dir[2];
ctl_table devices_root_dir[2]; struct ctl_table devices_root_dir[2];
ctl_table port_dir[2]; struct ctl_table port_dir[2];
ctl_table parport_dir[2]; struct ctl_table parport_dir[2];
ctl_table dev_dir[2]; struct ctl_table dev_dir[2];
}; };
static const struct parport_device_sysctl_table static const struct parport_device_sysctl_table
...@@ -422,10 +422,10 @@ parport_device_sysctl_template = { ...@@ -422,10 +422,10 @@ parport_device_sysctl_template = {
struct parport_default_sysctl_table struct parport_default_sysctl_table
{ {
struct ctl_table_header *sysctl_header; struct ctl_table_header *sysctl_header;
ctl_table vars[3]; struct ctl_table vars[3];
ctl_table default_dir[2]; struct ctl_table default_dir[2];
ctl_table parport_dir[2]; struct ctl_table parport_dir[2];
ctl_table dev_dir[2]; struct ctl_table dev_dir[2];
}; };
static struct parport_default_sysctl_table static struct parport_default_sysctl_table
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment