aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2007-02-05 15:17:18 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-02-05 15:17:18 -0500
commit1125b4640fea29aafe9bf24672e2da9672f6592e (patch)
tree4bee00732f93df7145dc237a31d801ffec5fc663
parentc59d744bd8a0e283daf6726881e4c9aa4bd25261 (diff)
[S390] cio: Use device_{create,remove}_bin_file.
Create/remove the channel measurement binary files with device_{create,remove}_bin_file instead of sysfs_{create,remove}_bin_file. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--drivers/s390/cio/chsc.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index cbab8d2ce5cf..15b0e6329cf3 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -967,8 +967,8 @@ static struct bin_attribute chp_measurement_attr = {
967static void 967static void
968chsc_remove_chp_cmg_attr(struct channel_path *chp) 968chsc_remove_chp_cmg_attr(struct channel_path *chp)
969{ 969{
970 sysfs_remove_bin_file(&chp->dev.kobj, &chp_measurement_chars_attr); 970 device_remove_bin_file(&chp->dev, &chp_measurement_chars_attr);
971 sysfs_remove_bin_file(&chp->dev.kobj, &chp_measurement_attr); 971 device_remove_bin_file(&chp->dev, &chp_measurement_attr);
972} 972}
973 973
974static int 974static int
@@ -976,14 +976,12 @@ chsc_add_chp_cmg_attr(struct channel_path *chp)
976{ 976{
977 int ret; 977 int ret;
978 978
979 ret = sysfs_create_bin_file(&chp->dev.kobj, 979 ret = device_create_bin_file(&chp->dev, &chp_measurement_chars_attr);
980 &chp_measurement_chars_attr);
981 if (ret) 980 if (ret)
982 return ret; 981 return ret;
983 ret = sysfs_create_bin_file(&chp->dev.kobj, &chp_measurement_attr); 982 ret = device_create_bin_file(&chp->dev, &chp_measurement_attr);
984 if (ret) 983 if (ret)
985 sysfs_remove_bin_file(&chp->dev.kobj, 984 device_remove_bin_file(&chp->dev, &chp_measurement_chars_attr);
986 &chp_measurement_chars_attr);
987 return ret; 985 return ret;
988} 986}
989 987