1 files changed, 30 insertions, 2 deletions

diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index d7b25b8f71d2..7c7775aae38a 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -23,8 +23,7 @@
 #include "chsc.h"
 #include "device.h"
 
-int
-ccw_device_set_options(struct ccw_device *cdev, unsigned long flags)
+int ccw_device_set_options_mask(struct ccw_device *cdev, unsigned long flags)
 {
        /*
         * The flag usage is mutal exclusive ...
@@ -39,6 +38,33 @@ ccw_device_set_options(struct ccw_device *cdev, unsigned long flags)
         return 0;
 }
 
+int ccw_device_set_options(struct ccw_device *cdev, unsigned long flags)
+{
+       /*
+        * The flag usage is mutal exclusive ...
+        */
+        if (((flags & CCWDEV_EARLY_NOTIFICATION) &&
+            (flags & CCWDEV_REPORT_ALL)) ||
+            ((flags & CCWDEV_EARLY_NOTIFICATION) &&
+             cdev->private->options.repall) ||
+            ((flags & CCWDEV_REPORT_ALL) &&
+             cdev->private->options.fast))
+                return -EINVAL;
+        cdev->private->options.fast |= (flags & CCWDEV_EARLY_NOTIFICATION) != 0;
+        cdev->private->options.repall |= (flags & CCWDEV_REPORT_ALL) != 0;
+        cdev->private->options.pgroup |= (flags & CCWDEV_DO_PATHGROUP) != 0;
+        cdev->private->options.force |= (flags & CCWDEV_ALLOW_FORCE) != 0;
+        return 0;
+}
+
+void ccw_device_clear_options(struct ccw_device *cdev, unsigned long flags)
+{
+        cdev->private->options.fast &= (flags & CCWDEV_EARLY_NOTIFICATION) == 0;
+        cdev->private->options.repall &= (flags & CCWDEV_REPORT_ALL) == 0;
+        cdev->private->options.pgroup &= (flags & CCWDEV_DO_PATHGROUP) == 0;
+        cdev->private->options.force &= (flags & CCWDEV_ALLOW_FORCE) == 0;
+}
+
 int
 ccw_device_clear(struct ccw_device *cdev, unsigned long intparm)
 {
@@ -601,7 +627,9 @@ _ccw_device_get_device_number(struct ccw_device *cdev)
 
 
 MODULE_LICENSE("GPL");
+EXPORT_SYMBOL(ccw_device_set_options_mask);
 EXPORT_SYMBOL(ccw_device_set_options);
+EXPORT_SYMBOL(ccw_device_clear_options);
 EXPORT_SYMBOL(ccw_device_clear);
 EXPORT_SYMBOL(ccw_device_halt);
 EXPORT_SYMBOL(ccw_device_resume);