mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-22 04:15:02 +00:00
sysctl frv: Remove dead binary sysctl support
Now that sys_sysctl is a generic wrapper around /proc/sys .ctl_name and .strategy members of sysctl tables are dead code. Remove them. Cc: David Howells <dhowells@redhat.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
parent
1639319222
commit
67a7e4f8bd
2 changed files with 2 additions and 107 deletions
|
@ -211,37 +211,6 @@ static int cmode_procctl(ctl_table *ctl, int write,
|
||||||
return try_set_cmode(new_cmode)?:*lenp;
|
return try_set_cmode(new_cmode)?:*lenp;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cmode_sysctl(ctl_table *table,
|
|
||||||
void __user *oldval, size_t __user *oldlenp,
|
|
||||||
void __user *newval, size_t newlen)
|
|
||||||
{
|
|
||||||
if (oldval && oldlenp) {
|
|
||||||
size_t oldlen;
|
|
||||||
|
|
||||||
if (get_user(oldlen, oldlenp))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
if (oldlen != sizeof(int))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
if (put_user(clock_cmode_current, (unsigned __user *)oldval) ||
|
|
||||||
put_user(sizeof(int), oldlenp))
|
|
||||||
return -EFAULT;
|
|
||||||
}
|
|
||||||
if (newval && newlen) {
|
|
||||||
int new_cmode;
|
|
||||||
|
|
||||||
if (newlen != sizeof(int))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
if (get_user(new_cmode, (int __user *)newval))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
return try_set_cmode(new_cmode)?:1;
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int try_set_p0(int new_p0)
|
static int try_set_p0(int new_p0)
|
||||||
{
|
{
|
||||||
unsigned long flags, clkc;
|
unsigned long flags, clkc;
|
||||||
|
@ -314,37 +283,6 @@ static int p0_procctl(ctl_table *ctl, int write,
|
||||||
return try_set_p0(new_p0)?:*lenp;
|
return try_set_p0(new_p0)?:*lenp;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int p0_sysctl(ctl_table *table,
|
|
||||||
void __user *oldval, size_t __user *oldlenp,
|
|
||||||
void __user *newval, size_t newlen)
|
|
||||||
{
|
|
||||||
if (oldval && oldlenp) {
|
|
||||||
size_t oldlen;
|
|
||||||
|
|
||||||
if (get_user(oldlen, oldlenp))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
if (oldlen != sizeof(int))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
if (put_user(clock_p0_current, (unsigned __user *)oldval) ||
|
|
||||||
put_user(sizeof(int), oldlenp))
|
|
||||||
return -EFAULT;
|
|
||||||
}
|
|
||||||
if (newval && newlen) {
|
|
||||||
int new_p0;
|
|
||||||
|
|
||||||
if (newlen != sizeof(int))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
if (get_user(new_p0, (int __user *)newval))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
return try_set_p0(new_p0)?:1;
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int cm_procctl(ctl_table *ctl, int write,
|
static int cm_procctl(ctl_table *ctl, int write,
|
||||||
void __user *buffer, size_t *lenp, loff_t *fpos)
|
void __user *buffer, size_t *lenp, loff_t *fpos)
|
||||||
{
|
{
|
||||||
|
@ -358,42 +296,9 @@ static int cm_procctl(ctl_table *ctl, int write,
|
||||||
return try_set_cm(new_cm)?:*lenp;
|
return try_set_cm(new_cm)?:*lenp;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cm_sysctl(ctl_table *table,
|
|
||||||
void __user *oldval, size_t __user *oldlenp,
|
|
||||||
void __user *newval, size_t newlen)
|
|
||||||
{
|
|
||||||
if (oldval && oldlenp) {
|
|
||||||
size_t oldlen;
|
|
||||||
|
|
||||||
if (get_user(oldlen, oldlenp))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
if (oldlen != sizeof(int))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
if (put_user(clock_cm_current, (unsigned __user *)oldval) ||
|
|
||||||
put_user(sizeof(int), oldlenp))
|
|
||||||
return -EFAULT;
|
|
||||||
}
|
|
||||||
if (newval && newlen) {
|
|
||||||
int new_cm;
|
|
||||||
|
|
||||||
if (newlen != sizeof(int))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
if (get_user(new_cm, (int __user *)newval))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
return try_set_cm(new_cm)?:1;
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static struct ctl_table pm_table[] =
|
static struct ctl_table pm_table[] =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
.ctl_name = CTL_UNNUMBERED,
|
|
||||||
.procname = "suspend",
|
.procname = "suspend",
|
||||||
.data = NULL,
|
.data = NULL,
|
||||||
.maxlen = 0,
|
.maxlen = 0,
|
||||||
|
@ -401,44 +306,37 @@ static struct ctl_table pm_table[] =
|
||||||
.proc_handler = &sysctl_pm_do_suspend,
|
.proc_handler = &sysctl_pm_do_suspend,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.ctl_name = CTL_PM_CMODE,
|
|
||||||
.procname = "cmode",
|
.procname = "cmode",
|
||||||
.data = &clock_cmode_current,
|
.data = &clock_cmode_current,
|
||||||
.maxlen = sizeof(int),
|
.maxlen = sizeof(int),
|
||||||
.mode = 0644,
|
.mode = 0644,
|
||||||
.proc_handler = &cmode_procctl,
|
.proc_handler = &cmode_procctl,
|
||||||
.strategy = &cmode_sysctl,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.ctl_name = CTL_PM_P0,
|
|
||||||
.procname = "p0",
|
.procname = "p0",
|
||||||
.data = &clock_p0_current,
|
.data = &clock_p0_current,
|
||||||
.maxlen = sizeof(int),
|
.maxlen = sizeof(int),
|
||||||
.mode = 0644,
|
.mode = 0644,
|
||||||
.proc_handler = &p0_procctl,
|
.proc_handler = &p0_procctl,
|
||||||
.strategy = &p0_sysctl,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.ctl_name = CTL_PM_CM,
|
|
||||||
.procname = "cm",
|
.procname = "cm",
|
||||||
.data = &clock_cm_current,
|
.data = &clock_cm_current,
|
||||||
.maxlen = sizeof(int),
|
.maxlen = sizeof(int),
|
||||||
.mode = 0644,
|
.mode = 0644,
|
||||||
.proc_handler = &cm_procctl,
|
.proc_handler = &cm_procctl,
|
||||||
.strategy = &cm_sysctl,
|
|
||||||
},
|
},
|
||||||
{ .ctl_name = 0}
|
{ }
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct ctl_table pm_dir_table[] =
|
static struct ctl_table pm_dir_table[] =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
.ctl_name = CTL_PM,
|
|
||||||
.procname = "pm",
|
.procname = "pm",
|
||||||
.mode = 0555,
|
.mode = 0555,
|
||||||
.child = pm_table,
|
.child = pm_table,
|
||||||
},
|
},
|
||||||
{ .ctl_name = 0}
|
{ }
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -176,7 +176,6 @@ static int procctl_frv_pin_cxnr(ctl_table *table, int write, struct file *filp,
|
||||||
static struct ctl_table frv_table[] =
|
static struct ctl_table frv_table[] =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
.ctl_name = CTL_UNNUMBERD,
|
|
||||||
.procname = "cache-mode",
|
.procname = "cache-mode",
|
||||||
.data = NULL,
|
.data = NULL,
|
||||||
.maxlen = 0,
|
.maxlen = 0,
|
||||||
|
@ -185,7 +184,6 @@ static struct ctl_table frv_table[] =
|
||||||
},
|
},
|
||||||
#ifdef CONFIG_MMU
|
#ifdef CONFIG_MMU
|
||||||
{
|
{
|
||||||
.ctl_name = CTL_UNNUMBERD,
|
|
||||||
.procname = "pin-cxnr",
|
.procname = "pin-cxnr",
|
||||||
.data = NULL,
|
.data = NULL,
|
||||||
.maxlen = 0,
|
.maxlen = 0,
|
||||||
|
@ -203,7 +201,6 @@ static struct ctl_table frv_table[] =
|
||||||
static struct ctl_table frv_dir_table[] =
|
static struct ctl_table frv_dir_table[] =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
.ctl_name = CTL_UNNUMBERED,
|
|
||||||
.procname = "frv",
|
.procname = "frv",
|
||||||
.mode = 0555,
|
.mode = 0555,
|
||||||
.child = frv_table
|
.child = frv_table
|
||||||
|
|
Loading…
Reference in a new issue