Explorar o código

x86: switch to proc_create()

Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Alexey Dobriyan %!s(int64=17) %!d(string=hai) anos
pai
achega
11ae9dd481
Modificáronse 2 ficheiros con 4 adicións e 8 borrados
  1. 1 4
      arch/x86/kernel/apm_32.c
  2. 3 4
      arch/x86/kernel/cpu/mtrr/if.c

+ 1 - 4
arch/x86/kernel/apm_32.c

@@ -2217,7 +2217,6 @@ static struct dmi_system_id __initdata apm_dmi_table[] = {
  */
  */
 static int __init apm_init(void)
 static int __init apm_init(void)
 {
 {
-	struct proc_dir_entry *apm_proc;
 	struct desc_struct *gdt;
 	struct desc_struct *gdt;
 	int err;
 	int err;
 
 
@@ -2322,9 +2321,7 @@ static int __init apm_init(void)
 	set_base(gdt[APM_DS >> 3],
 	set_base(gdt[APM_DS >> 3],
 		 __va((unsigned long)apm_info.bios.dseg << 4));
 		 __va((unsigned long)apm_info.bios.dseg << 4));
 
 
-	apm_proc = create_proc_entry("apm", 0, NULL);
-	if (apm_proc)
-		apm_proc->proc_fops = &apm_file_ops;
+	proc_create("apm", 0, NULL, &apm_file_ops);
 
 
 	kapmd_task = kthread_create(apm, NULL, "kapmd");
 	kapmd_task = kthread_create(apm, NULL, "kapmd");
 	if (IS_ERR(kapmd_task)) {
 	if (IS_ERR(kapmd_task)) {

+ 3 - 4
arch/x86/kernel/cpu/mtrr/if.c

@@ -424,11 +424,10 @@ static int __init mtrr_if_init(void)
 		return -ENODEV;
 		return -ENODEV;
 
 
 	proc_root_mtrr =
 	proc_root_mtrr =
-	    create_proc_entry("mtrr", S_IWUSR | S_IRUGO, &proc_root);
-	if (proc_root_mtrr) {
+		proc_create("mtrr", S_IWUSR | S_IRUGO, &proc_root, &mtrr_fops);
+
+	if (proc_root_mtrr)
 		proc_root_mtrr->owner = THIS_MODULE;
 		proc_root_mtrr->owner = THIS_MODULE;
-		proc_root_mtrr->proc_fops = &mtrr_fops;
-	}
 	return 0;
 	return 0;
 }
 }