leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[S390] fix subsystem removal fallout

Browse Source 
This patch fixes compilation on s390 after the removal of
struct subsystem.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Cornelia Huck 2007-05-10 15:45:41 +02:00 committed by Martin Schwidefsky
parent de5603748a
commit 0b0bb3c6bd
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/hypfs/inode.c
View File

@ -477,7 +477,7 @@ static int __init hypfs_init(void)
goto fail_diag; goto fail_diag;
} }
} }
kset_set_kset_s(&s390_subsys, hypervisor_subsys); kobj_set_kset_s(&s390_subsys, hypervisor_subsys);
rc = subsystem_register(&s390_subsys); rc = subsystem_register(&s390_subsys);
if (rc) if (rc)
goto fail_sysfs; goto fail_sysfs;

26
arch/s390/kernel/ipl.c
View File

@ -816,23 +816,23 @@ static int __init ipl_register_fcp_files(void)
{ {
int rc; int rc;
rc = sysfs_create_group(&ipl_subsys.kset.kobj, rc = sysfs_create_group(&ipl_subsys.kobj,
&ipl_fcp_attr_group); &ipl_fcp_attr_group);
if (rc) if (rc)
goto out; goto out;
rc = sysfs_create_bin_file(&ipl_subsys.kset.kobj, rc = sysfs_create_bin_file(&ipl_subsys.kobj,
&ipl_parameter_attr); &ipl_parameter_attr);
if (rc) if (rc)
goto out_ipl_parm; goto out_ipl_parm;
rc = sysfs_create_bin_file(&ipl_subsys.kset.kobj, rc = sysfs_create_bin_file(&ipl_subsys.kobj,
&ipl_scp_data_attr); &ipl_scp_data_attr);
if (!rc) if (!rc)
goto out; goto out;
sysfs_remove_bin_file(&ipl_subsys.kset.kobj, &ipl_parameter_attr); sysfs_remove_bin_file(&ipl_subsys.kobj, &ipl_parameter_attr);
out_ipl_parm: out_ipl_parm:
sysfs_remove_group(&ipl_subsys.kset.kobj, &ipl_fcp_attr_group); sysfs_remove_group(&ipl_subsys.kobj, &ipl_fcp_attr_group);
out: out:
return rc; return rc;
} }
@ -846,7 +846,7 @@ static int __init ipl_init(void)
return rc; return rc;
switch (ipl_info.type) { switch (ipl_info.type) {
case IPL_TYPE_CCW: case IPL_TYPE_CCW:
rc = sysfs_create_group(&ipl_subsys.kset.kobj, rc = sysfs_create_group(&ipl_subsys.kobj,
&ipl_ccw_attr_group); &ipl_ccw_attr_group);
break; break;
case IPL_TYPE_FCP: case IPL_TYPE_FCP:
@ -854,11 +854,11 @@ static int __init ipl_init(void)
rc = ipl_register_fcp_files(); rc = ipl_register_fcp_files();
break; break;
case IPL_TYPE_NSS: case IPL_TYPE_NSS:
rc = sysfs_create_group(&ipl_subsys.kset.kobj, rc = sysfs_create_group(&ipl_subsys.kobj,
&ipl_nss_attr_group); &ipl_nss_attr_group);
break; break;
default: default:
rc = sysfs_create_group(&ipl_subsys.kset.kobj, rc = sysfs_create_group(&ipl_subsys.kobj,
&ipl_unknown_attr_group); &ipl_unknown_attr_group);
break; break;
} }
@ -885,7 +885,7 @@ static int __init reipl_nss_init(void)
if (!MACHINE_IS_VM) if (!MACHINE_IS_VM)
return 0; return 0;
rc = sysfs_create_group(&reipl_subsys.kset.kobj, &reipl_nss_attr_group); rc = sysfs_create_group(&reipl_subsys.kobj, &reipl_nss_attr_group);
if (rc) if (rc)
return rc; return rc;
strncpy(reipl_nss_name, kernel_nss_name, NSS_NAME_SIZE + 1); strncpy(reipl_nss_name, kernel_nss_name, NSS_NAME_SIZE + 1);
@ -900,7 +900,7 @@ static int __init reipl_ccw_init(void)
reipl_block_ccw = (void *) get_zeroed_page(GFP_KERNEL); reipl_block_ccw = (void *) get_zeroed_page(GFP_KERNEL);
if (!reipl_block_ccw) if (!reipl_block_ccw)
return -ENOMEM; return -ENOMEM;
rc = sysfs_create_group(&reipl_subsys.kset.kobj, &reipl_ccw_attr_group); rc = sysfs_create_group(&reipl_subsys.kobj, &reipl_ccw_attr_group);
if (rc) { if (rc) {
free_page((unsigned long)reipl_block_ccw); free_page((unsigned long)reipl_block_ccw);
return rc; return rc;
@ -938,7 +938,7 @@ static int __init reipl_fcp_init(void)
reipl_block_fcp = (void *) get_zeroed_page(GFP_KERNEL); reipl_block_fcp = (void *) get_zeroed_page(GFP_KERNEL);
if (!reipl_block_fcp) if (!reipl_block_fcp)
return -ENOMEM; return -ENOMEM;
rc = sysfs_create_group(&reipl_subsys.kset.kobj, &reipl_fcp_attr_group); rc = sysfs_create_group(&reipl_subsys.kobj, &reipl_fcp_attr_group);
if (rc) { if (rc) {
free_page((unsigned long)reipl_block_fcp); free_page((unsigned long)reipl_block_fcp);
return rc; return rc;
@ -990,7 +990,7 @@ static int __init dump_ccw_init(void)
dump_block_ccw = (void *) get_zeroed_page(GFP_KERNEL); dump_block_ccw = (void *) get_zeroed_page(GFP_KERNEL);
if (!dump_block_ccw) if (!dump_block_ccw)
return -ENOMEM; return -ENOMEM;
rc = sysfs_create_group(&dump_subsys.kset.kobj, &dump_ccw_attr_group); rc = sysfs_create_group(&dump_subsys.kobj, &dump_ccw_attr_group);
if (rc) { if (rc) {
free_page((unsigned long)dump_block_ccw); free_page((unsigned long)dump_block_ccw);
return rc; return rc;
@ -1014,7 +1014,7 @@ static int __init dump_fcp_init(void)
dump_block_fcp = (void *) get_zeroed_page(GFP_KERNEL); dump_block_fcp = (void *) get_zeroed_page(GFP_KERNEL);
if (!dump_block_fcp) if (!dump_block_fcp)
return -ENOMEM; return -ENOMEM;
rc = sysfs_create_group(&dump_subsys.kset.kobj, &dump_fcp_attr_group); rc = sysfs_create_group(&dump_subsys.kobj, &dump_fcp_attr_group);
if (rc) { if (rc) {
free_page((unsigned long)dump_block_fcp); free_page((unsigned long)dump_block_fcp);
return rc; return rc;