| Message ID | 20230302204612.782387-3-mcgrof@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d352cb47df7540a52bf2d0c33d90694c5cdb6cb8 |
| Headers | show |
| Series | sysctl: slowly deprecate register_sysctl_table() | expand |
On Thu, Mar 02, 2023 at 12:46:07PM -0800, Luis Chamberlain wrote: > register_sysctl_table() is a deprecated compatibility wrapper. > register_sysctl() can do the directory creation for you so just use > that. Thanks, I have included this in my tree for the next merge window. -corey > > Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> > --- > drivers/char/ipmi/ipmi_poweroff.c | 16 +--------------- > 1 file changed, 1 insertion(+), 15 deletions(-) > > diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c > index 163ec9749e55..870659d91db2 100644 > --- a/drivers/char/ipmi/ipmi_poweroff.c > +++ b/drivers/char/ipmi/ipmi_poweroff.c > @@ -659,20 +659,6 @@ static struct ctl_table ipmi_table[] = { > { } > }; > > -static struct ctl_table ipmi_dir_table[] = { > - { .procname = "ipmi", > - .mode = 0555, > - .child = ipmi_table }, > - { } > -}; > - > -static struct ctl_table ipmi_root_table[] = { > - { .procname = "dev", > - .mode = 0555, > - .child = ipmi_dir_table }, > - { } > -}; > - > static struct ctl_table_header *ipmi_table_header; > #endif /* CONFIG_PROC_FS */ > > @@ -689,7 +675,7 @@ static int __init ipmi_poweroff_init(void) > pr_info("Power cycle is enabled\n"); > > #ifdef CONFIG_PROC_FS > - ipmi_table_header = register_sysctl_table(ipmi_root_table); > + ipmi_table_header = register_sysctl("dev/ipmi", ipmi_table); > if (!ipmi_table_header) { > pr_err("Unable to register powercycle sysctl\n"); > rv = -ENOMEM; > -- > 2.39.1 >
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c index 163ec9749e55..870659d91db2 100644 --- a/drivers/char/ipmi/ipmi_poweroff.c +++ b/drivers/char/ipmi/ipmi_poweroff.c @@ -659,20 +659,6 @@ static struct ctl_table ipmi_table[] = { { } }; -static struct ctl_table ipmi_dir_table[] = { - { .procname = "ipmi", - .mode = 0555, - .child = ipmi_table }, - { } -}; - -static struct ctl_table ipmi_root_table[] = { - { .procname = "dev", - .mode = 0555, - .child = ipmi_dir_table }, - { } -}; - static struct ctl_table_header *ipmi_table_header; #endif /* CONFIG_PROC_FS */ @@ -689,7 +675,7 @@ static int __init ipmi_poweroff_init(void) pr_info("Power cycle is enabled\n"); #ifdef CONFIG_PROC_FS - ipmi_table_header = register_sysctl_table(ipmi_root_table); + ipmi_table_header = register_sysctl("dev/ipmi", ipmi_table); if (!ipmi_table_header) { pr_err("Unable to register powercycle sysctl\n"); rv = -ENOMEM;
register_sysctl_table() is a deprecated compatibility wrapper. register_sysctl() can do the directory creation for you so just use that. Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- drivers/char/ipmi/ipmi_poweroff.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)