s390/qdio: Rename feature flag aif_osa to aif_qdio

This feature is not only utilized by OSA, but by QDIO in general. Clear
up possible confusions.

Signed-off-by: Benjamin Block <bblock@linux.ibm.com>
Reviewed-by: Steffen Maier <maier@linux.ibm.com>
Acked-by: Alexandra Winter <wintera@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>

diff --git a/arch/s390/include/asm/css_chars.h b/arch/s390/include/asm/css_chars.h
index 638137d46c85c8a8dfb5b237ac542fd7f25b02e5..a03f6403376002ceda96b73da70df25d6a5839b0 100644 (file)
--- a/arch/s390/include/asm/css_chars.h
+++ b/arch/s390/include/asm/css_chars.h
@@ -25,7 +25,7 @@ struct css_general_char {
        u64 : 2;
 
        u64 : 3;
-       u64 aif_osa : 1; /* bit 67 */
+       u64 aif_qdio : 1;/* bit 67 */
        u64 : 12;
        u64 eadm_rf : 1; /* bit 80 */
        u64 : 1;

diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index 641f0dbb65a90b15577b27a941a8b65718b09159..5c09f2ef874e921511e7f566f0c36ff46d36e744 100644 (file)
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -266,7 +266,7 @@ struct qdio_irq {
 
 #define is_thinint_irq(irq) \
        (irq->qib.qfmt == QDIO_IQDIO_QFMT || \
-        css_general_characteristics.aif_osa)
+        css_general_characteristics.aif_qdio)
 
 #define qperf(__qdev, __attr)  ((__qdev)->perf_stat.(__attr))
 

diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index 99c0fd23022de3f2c8d97366ab705a07ad2d846d..1f532b112194bd82f129d2a863a047677c09fdfe 100644 (file)
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -423,7 +423,7 @@ int __init qdio_setup_init(void)
 
        /* Check for OSA/FCP thin interrupts (bit 67). */
        DBF_EVENT("thinint:%1d",
-                 (css_general_characteristics.aif_osa) ? 1 : 0);
+                 (css_general_characteristics.aif_qdio) ? 1 : 0);
 
        /* Check for QEBSM support in general (bit 58). */
        DBF_EVENT("cssQEBSM:%1d", css_general_characteristics.qebsm);