aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/hypfs/inode.c2
-rw-r--r--arch/s390/kernel/ipl.c26
2 files changed, 14 insertions, 14 deletions
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index ba5d3167df0d..8e1ea1c40128 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -477,7 +477,7 @@ static int __init hypfs_init(void)
477 goto fail_diag; 477 goto fail_diag;
478 } 478 }
479 } 479 }
480 kset_set_kset_s(&s390_subsys, hypervisor_subsys); 480 kobj_set_kset_s(&s390_subsys, hypervisor_subsys);
481 rc = subsystem_register(&s390_subsys); 481 rc = subsystem_register(&s390_subsys);
482 if (rc) 482 if (rc)
483 goto fail_sysfs; 483 goto fail_sysfs;
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 0ea048d350d8..367caf92ea78 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -816,23 +816,23 @@ static int __init ipl_register_fcp_files(void)
816{ 816{
817 int rc; 817 int rc;
818 818
819 rc = sysfs_create_group(&ipl_subsys.kset.kobj, 819 rc = sysfs_create_group(&ipl_subsys.kobj,
820 &ipl_fcp_attr_group); 820 &ipl_fcp_attr_group);
821 if (rc) 821 if (rc)
822 goto out; 822 goto out;
823 rc = sysfs_create_bin_file(&ipl_subsys.kset.kobj, 823 rc = sysfs_create_bin_file(&ipl_subsys.kobj,
824 &ipl_parameter_attr); 824 &ipl_parameter_attr);
825 if (rc) 825 if (rc)
826 goto out_ipl_parm; 826 goto out_ipl_parm;
827 rc = sysfs_create_bin_file(&ipl_subsys.kset.kobj, 827 rc = sysfs_create_bin_file(&ipl_subsys.kobj,
828 &ipl_scp_data_attr); 828 &ipl_scp_data_attr);
829 if (!rc) 829 if (!rc)
830 goto out; 830 goto out;
831 831
832 sysfs_remove_bin_file(&ipl_subsys.kset.kobj, &ipl_parameter_attr); 832 sysfs_remove_bin_file(&ipl_subsys.kobj, &ipl_parameter_attr);
833 833
834out_ipl_parm: 834out_ipl_parm:
835 sysfs_remove_group(&ipl_subsys.kset.kobj, &ipl_fcp_attr_group); 835 sysfs_remove_group(&ipl_subsys.kobj, &ipl_fcp_attr_group);
836out: 836out:
837 return rc; 837 return rc;
838} 838}
@@ -846,7 +846,7 @@ static int __init ipl_init(void)
846 return rc; 846 return rc;
847 switch (ipl_info.type) { 847 switch (ipl_info.type) {
848 case IPL_TYPE_CCW: 848 case IPL_TYPE_CCW:
849 rc = sysfs_create_group(&ipl_subsys.kset.kobj, 849 rc = sysfs_create_group(&ipl_subsys.kobj,
850 &ipl_ccw_attr_group); 850 &ipl_ccw_attr_group);
851 break; 851 break;
852 case IPL_TYPE_FCP: 852 case IPL_TYPE_FCP:
@@ -854,11 +854,11 @@ static int __init ipl_init(void)
854 rc = ipl_register_fcp_files(); 854 rc = ipl_register_fcp_files();
855 break; 855 break;
856 case IPL_TYPE_NSS: 856 case IPL_TYPE_NSS:
857 rc = sysfs_create_group(&ipl_subsys.kset.kobj, 857 rc = sysfs_create_group(&ipl_subsys.kobj,
858 &ipl_nss_attr_group); 858 &ipl_nss_attr_group);
859 break; 859 break;
860 default: 860 default:
861 rc = sysfs_create_group(&ipl_subsys.kset.kobj, 861 rc = sysfs_create_group(&ipl_subsys.kobj,
862 &ipl_unknown_attr_group); 862 &ipl_unknown_attr_group);
863 break; 863 break;
864 } 864 }
@@ -885,7 +885,7 @@ static int __init reipl_nss_init(void)
885 885
886 if (!MACHINE_IS_VM) 886 if (!MACHINE_IS_VM)
887 return 0; 887 return 0;
888 rc = sysfs_create_group(&reipl_subsys.kset.kobj, &reipl_nss_attr_group); 888 rc = sysfs_create_group(&reipl_subsys.kobj, &reipl_nss_attr_group);
889 if (rc) 889 if (rc)
890 return rc; 890 return rc;
891 strncpy(reipl_nss_name, kernel_nss_name, NSS_NAME_SIZE + 1); 891 strncpy(reipl_nss_name, kernel_nss_name, NSS_NAME_SIZE + 1);
@@ -900,7 +900,7 @@ static int __init reipl_ccw_init(void)
900 reipl_block_ccw = (void *) get_zeroed_page(GFP_KERNEL); 900 reipl_block_ccw = (void *) get_zeroed_page(GFP_KERNEL);
901 if (!reipl_block_ccw) 901 if (!reipl_block_ccw)
902 return -ENOMEM; 902 return -ENOMEM;
903 rc = sysfs_create_group(&reipl_subsys.kset.kobj, &reipl_ccw_attr_group); 903 rc = sysfs_create_group(&reipl_subsys.kobj, &reipl_ccw_attr_group);
904 if (rc) { 904 if (rc) {
905 free_page((unsigned long)reipl_block_ccw); 905 free_page((unsigned long)reipl_block_ccw);
906 return rc; 906 return rc;
@@ -938,7 +938,7 @@ static int __init reipl_fcp_init(void)
938 reipl_block_fcp = (void *) get_zeroed_page(GFP_KERNEL); 938 reipl_block_fcp = (void *) get_zeroed_page(GFP_KERNEL);
939 if (!reipl_block_fcp) 939 if (!reipl_block_fcp)
940 return -ENOMEM; 940 return -ENOMEM;
941 rc = sysfs_create_group(&reipl_subsys.kset.kobj, &reipl_fcp_attr_group); 941 rc = sysfs_create_group(&reipl_subsys.kobj, &reipl_fcp_attr_group);
942 if (rc) { 942 if (rc) {
943 free_page((unsigned long)reipl_block_fcp); 943 free_page((unsigned long)reipl_block_fcp);
944 return rc; 944 return rc;
@@ -990,7 +990,7 @@ static int __init dump_ccw_init(void)
990 dump_block_ccw = (void *) get_zeroed_page(GFP_KERNEL); 990 dump_block_ccw = (void *) get_zeroed_page(GFP_KERNEL);
991 if (!dump_block_ccw) 991 if (!dump_block_ccw)
992 return -ENOMEM; 992 return -ENOMEM;
993 rc = sysfs_create_group(&dump_subsys.kset.kobj, &dump_ccw_attr_group); 993 rc = sysfs_create_group(&dump_subsys.kobj, &dump_ccw_attr_group);
994 if (rc) { 994 if (rc) {
995 free_page((unsigned long)dump_block_ccw); 995 free_page((unsigned long)dump_block_ccw);
996 return rc; 996 return rc;
@@ -1014,7 +1014,7 @@ static int __init dump_fcp_init(void)
1014 dump_block_fcp = (void *) get_zeroed_page(GFP_KERNEL); 1014 dump_block_fcp = (void *) get_zeroed_page(GFP_KERNEL);
1015 if (!dump_block_fcp) 1015 if (!dump_block_fcp)
1016 return -ENOMEM; 1016 return -ENOMEM;
1017 rc = sysfs_create_group(&dump_subsys.kset.kobj, &dump_fcp_attr_group); 1017 rc = sysfs_create_group(&dump_subsys.kobj, &dump_fcp_attr_group);
1018 if (rc) { 1018 if (rc) {
1019 free_page((unsigned long)dump_block_fcp); 1019 free_page((unsigned long)dump_block_fcp);
1020 return rc; 1020 return rc;