net/ncsi: Introduce NCSI_RESERVED_CHANNEL

This defines NCSI_RESERVED_CHANNEL as the reserved NCSI channel
ID (0x1f). No logical changes introduced.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ncsi/internal.h b/net/ncsi/internal.h
index 33738c060547ae99afc3286be6ed5d548cef15e7..66dc851d49eeea0e152d4ff263da951701fbdbd4 100644 (file)
--- a/net/ncsi/internal.h
+++ b/net/ncsi/internal.h
@@ -170,6 +170,7 @@ struct ncsi_package;
 
 #define NCSI_PACKAGE_SHIFT     5
 #define NCSI_PACKAGE_INDEX(c)  (((c) >> NCSI_PACKAGE_SHIFT) & 0x7)
+#define NCSI_RESERVED_CHANNEL  0x1f
 #define NCSI_CHANNEL_INDEX(c)  ((c) & ((1 << NCSI_PACKAGE_SHIFT) - 1))
 #define NCSI_TO_CHANNEL(p, c)  (((p) << NCSI_PACKAGE_SHIFT) | (c))
 

diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c
index a26ce5132549cfbc9dc556c53de5f249f24262c0..97c99bee8b68a3efaa368de0f1af54235e122133 100644 (file)
--- a/net/ncsi/ncsi-manage.c
+++ b/net/ncsi/ncsi-manage.c
@@ -542,7 +542,7 @@ static void ncsi_suspend_channel(struct ncsi_dev_priv *ndp)
                nca.package = np->id;
                if (nd->state == ncsi_dev_state_suspend_select) {
                        nca.type = NCSI_PKT_CMD_SP;
-                       nca.channel = 0x1f;
+                       nca.channel = NCSI_RESERVED_CHANNEL;
                        if (ndp->flags & NCSI_DEV_HWA)
                                nca.bytes[0] = 0;
                        else
@@ -559,7 +559,7 @@ static void ncsi_suspend_channel(struct ncsi_dev_priv *ndp)
                        nd->state = ncsi_dev_state_suspend_deselect;
                } else if (nd->state == ncsi_dev_state_suspend_deselect) {
                        nca.type = NCSI_PKT_CMD_DP;
-                       nca.channel = 0x1f;
+                       nca.channel = NCSI_RESERVED_CHANNEL;
                        nd->state = ncsi_dev_state_suspend_done;
                }
 
@@ -608,7 +608,7 @@ static void ncsi_configure_channel(struct ncsi_dev_priv *ndp)
                else
                        nca.bytes[0] = 1;
                nca.package = np->id;
-               nca.channel = 0x1f;
+               nca.channel = NCSI_RESERVED_CHANNEL;
                ret = ncsi_xmit_cmd(&nca);
                if (ret)
                        goto error;
@@ -834,7 +834,7 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp)
 
                /* Deselect all possible packages */
                nca.type = NCSI_PKT_CMD_DP;
-               nca.channel = 0x1f;
+               nca.channel = NCSI_RESERVED_CHANNEL;
                for (index = 0; index < 8; index++) {
                        nca.package = index;
                        ret = ncsi_xmit_cmd(&nca);
@@ -850,7 +850,7 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp)
                /* Select all possible packages */
                nca.type = NCSI_PKT_CMD_SP;
                nca.bytes[0] = 1;
-               nca.channel = 0x1f;
+               nca.channel = NCSI_RESERVED_CHANNEL;
                for (index = 0; index < 8; index++) {
                        nca.package = index;
                        ret = ncsi_xmit_cmd(&nca);
@@ -903,7 +903,7 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp)
                nca.type = NCSI_PKT_CMD_SP;
                nca.bytes[0] = 1;
                nca.package = ndp->active_package->id;
-               nca.channel = 0x1f;
+               nca.channel = NCSI_RESERVED_CHANNEL;
                ret = ncsi_xmit_cmd(&nca);
                if (ret)
                        goto error;
@@ -960,7 +960,7 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp)
                /* Deselect the active package */
                nca.type = NCSI_PKT_CMD_DP;
                nca.package = ndp->active_package->id;
-               nca.channel = 0x1f;
+               nca.channel = NCSI_RESERVED_CHANNEL;
                ret = ncsi_xmit_cmd(&nca);
                if (ret)
                        goto error;