Commit b91d9e67 authored by Cornelia Huck's avatar Cornelia Huck Committed by Vasily Gorbik

s390/cio: fix intparm documentation

The common I/O layer is maintaining an "intparm" inspired by
the hardware intparm for driver usage. This "intparm" is not
only applicaple for ssch, but also for hsch/csch. The kerneldoc
states that it is only updated for hsch/csch if no prior request
is pending; however, this is not what the code does (whether
that would actually desireable is a different issue.)

Let's at least fix the kerneldoc for now.

Fixes: b2ffd8e9 ("[S390] cio: Add docbook comments.")
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarSebastian Ott <sebott@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent f71fee27
...@@ -124,9 +124,7 @@ EXPORT_SYMBOL(ccw_device_is_multipath); ...@@ -124,9 +124,7 @@ EXPORT_SYMBOL(ccw_device_is_multipath);
/** /**
* ccw_device_clear() - terminate I/O request processing * ccw_device_clear() - terminate I/O request processing
* @cdev: target ccw device * @cdev: target ccw device
* @intparm: interruption parameter; value is only used if no I/O is * @intparm: interruption parameter to be returned upon conclusion of csch
* outstanding, otherwise the intparm associated with the I/O request
* is returned
* *
* ccw_device_clear() calls csch on @cdev's subchannel. * ccw_device_clear() calls csch on @cdev's subchannel.
* Returns: * Returns:
...@@ -179,6 +177,9 @@ int ccw_device_clear(struct ccw_device *cdev, unsigned long intparm) ...@@ -179,6 +177,9 @@ int ccw_device_clear(struct ccw_device *cdev, unsigned long intparm)
* completed during the time specified by @expires. If a timeout occurs, the * completed during the time specified by @expires. If a timeout occurs, the
* channel program is terminated via xsch, hsch or csch, and the device's * channel program is terminated via xsch, hsch or csch, and the device's
* interrupt handler will be called with an irb containing ERR_PTR(-%ETIMEDOUT). * interrupt handler will be called with an irb containing ERR_PTR(-%ETIMEDOUT).
* The interruption handler will echo back the @intparm specified here, unless
* another interruption parameter is specified by a subsequent invocation of
* ccw_device_halt() or ccw_device_clear().
* Returns: * Returns:
* %0, if the operation was successful; * %0, if the operation was successful;
* -%EBUSY, if the device is busy, or status pending; * -%EBUSY, if the device is busy, or status pending;
...@@ -256,6 +257,9 @@ int ccw_device_start_timeout_key(struct ccw_device *cdev, struct ccw1 *cpa, ...@@ -256,6 +257,9 @@ int ccw_device_start_timeout_key(struct ccw_device *cdev, struct ccw1 *cpa,
* Start a S/390 channel program. When the interrupt arrives, the * Start a S/390 channel program. When the interrupt arrives, the
* IRQ handler is called, either immediately, delayed (dev-end missing, * IRQ handler is called, either immediately, delayed (dev-end missing,
* or sense required) or never (no IRQ handler registered). * or sense required) or never (no IRQ handler registered).
* The interruption handler will echo back the @intparm specified here, unless
* another interruption parameter is specified by a subsequent invocation of
* ccw_device_halt() or ccw_device_clear().
* Returns: * Returns:
* %0, if the operation was successful; * %0, if the operation was successful;
* -%EBUSY, if the device is busy, or status pending; * -%EBUSY, if the device is busy, or status pending;
...@@ -287,6 +291,9 @@ int ccw_device_start_key(struct ccw_device *cdev, struct ccw1 *cpa, ...@@ -287,6 +291,9 @@ int ccw_device_start_key(struct ccw_device *cdev, struct ccw1 *cpa,
* Start a S/390 channel program. When the interrupt arrives, the * Start a S/390 channel program. When the interrupt arrives, the
* IRQ handler is called, either immediately, delayed (dev-end missing, * IRQ handler is called, either immediately, delayed (dev-end missing,
* or sense required) or never (no IRQ handler registered). * or sense required) or never (no IRQ handler registered).
* The interruption handler will echo back the @intparm specified here, unless
* another interruption parameter is specified by a subsequent invocation of
* ccw_device_halt() or ccw_device_clear().
* Returns: * Returns:
* %0, if the operation was successful; * %0, if the operation was successful;
* -%EBUSY, if the device is busy, or status pending; * -%EBUSY, if the device is busy, or status pending;
...@@ -322,6 +329,9 @@ int ccw_device_start(struct ccw_device *cdev, struct ccw1 *cpa, ...@@ -322,6 +329,9 @@ int ccw_device_start(struct ccw_device *cdev, struct ccw1 *cpa,
* completed during the time specified by @expires. If a timeout occurs, the * completed during the time specified by @expires. If a timeout occurs, the
* channel program is terminated via xsch, hsch or csch, and the device's * channel program is terminated via xsch, hsch or csch, and the device's
* interrupt handler will be called with an irb containing ERR_PTR(-%ETIMEDOUT). * interrupt handler will be called with an irb containing ERR_PTR(-%ETIMEDOUT).
* The interruption handler will echo back the @intparm specified here, unless
* another interruption parameter is specified by a subsequent invocation of
* ccw_device_halt() or ccw_device_clear().
* Returns: * Returns:
* %0, if the operation was successful; * %0, if the operation was successful;
* -%EBUSY, if the device is busy, or status pending; * -%EBUSY, if the device is busy, or status pending;
...@@ -343,11 +353,12 @@ int ccw_device_start_timeout(struct ccw_device *cdev, struct ccw1 *cpa, ...@@ -343,11 +353,12 @@ int ccw_device_start_timeout(struct ccw_device *cdev, struct ccw1 *cpa,
/** /**
* ccw_device_halt() - halt I/O request processing * ccw_device_halt() - halt I/O request processing
* @cdev: target ccw device * @cdev: target ccw device
* @intparm: interruption parameter; value is only used if no I/O is * @intparm: interruption parameter to be returned upon conclusion of hsch
* outstanding, otherwise the intparm associated with the I/O request
* is returned
* *
* ccw_device_halt() calls hsch on @cdev's subchannel. * ccw_device_halt() calls hsch on @cdev's subchannel.
* The interruption handler will echo back the @intparm specified here, unless
* another interruption parameter is specified by a subsequent invocation of
* ccw_device_clear().
* Returns: * Returns:
* %0 on success, * %0 on success,
* -%ENODEV on device not operational, * -%ENODEV on device not operational,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment