Skip to content

Commit 02ea134

Browse files
Joelgranadosmcgrof
authored andcommitted
parport: Remove register_sysctl_table from parport_default_proc_register
This is part of the general push to deprecate register_sysctl_paths and register_sysctl_table. Simply change the full path "dev/parport/default" to point to an already existing set of table entries (vars). We also remove the unused elements from parport_default_table. To make sure the resulting directory structure did not change we made sure that `find /proc/sys/dev/ | sha1sum` was the same before and after the change. Signed-off-by: Joel Granados <j.granados@samsung.com> Reviewed-by: Luis Chamberlain <mcgrof@kernel.org> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
1 parent 4199a64 commit 02ea134

1 file changed

Lines changed: 1 addition & 17 deletions

File tree

drivers/parport/procfs.c

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -430,22 +430,6 @@ parport_default_sysctl_table = {
430430
.extra2 = (void*) &parport_max_spintime_value
431431
},
432432
{}
433-
},
434-
{
435-
{
436-
.procname = "default",
437-
.mode = 0555,
438-
.child = parport_default_sysctl_table.vars
439-
},
440-
{}
441-
},
442-
{
443-
PARPORT_PARPORT_DIR(parport_default_sysctl_table.default_dir),
444-
{}
445-
},
446-
{
447-
PARPORT_DEV_DIR(parport_default_sysctl_table.parport_dir),
448-
{}
449433
}
450434
};
451435

@@ -601,7 +585,7 @@ static int __init parport_default_proc_register(void)
601585
int ret;
602586

603587
parport_default_sysctl_table.sysctl_header =
604-
register_sysctl_table(parport_default_sysctl_table.dev_dir);
588+
register_sysctl("dev/parport/default", parport_default_sysctl_table.vars);
605589
if (!parport_default_sysctl_table.sysctl_header)
606590
return -ENOMEM;
607591
ret = parport_bus_init();

0 commit comments

Comments
 (0)