i40e: Remove XSTRINGIFY macro definitions and uses

Orabug: 24568124

Use __stringify instead.

Signed-off-by: Joe Perches <joe@perches.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 35f5034f8e4bb4bce0c95a2aea2c719afbf8201f)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 7a04fba2697380072ab3575022ce9d1651612d7e..d9be0c7b4648a6de6b3c7052cfb80222306b3ee8 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -120,10 +120,6 @@
 #define I40E_CURRENT_NVM_VERSION_HI 0x2
 #define I40E_CURRENT_NVM_VERSION_LO 0x40
 
-/* magic for getting defines into strings */
-#define STRINGIFY(foo)  #foo
-#define XSTRINGIFY(bar) STRINGIFY(bar)
-
 #define I40E_RX_DESC(R, i)                     \
        (&(((union i40e_32byte_rx_desc *)((R)->desc))[i]))
 #define I40E_TX_DESC(R, i)                     \

diff --git a/drivers/net/ethernet/intel/i40e/i40e_client.h b/drivers/net/ethernet/intel/i40e/i40e_client.h
index a4601d97fb24155f978ea9bb8de76276a14efc8d..38a6c36a6a0e3bfeeeb422d08ae6240d6dca3cde 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_client.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_client.h
@@ -36,9 +36,9 @@
 #define I40E_CLIENT_VERSION_MINOR 01
 #define I40E_CLIENT_VERSION_BUILD 00
 #define I40E_CLIENT_VERSION_STR     \
-       XSTRINGIFY(I40E_CLIENT_VERSION_MAJOR) "." \
-       XSTRINGIFY(I40E_CLIENT_VERSION_MINOR) "." \
-       XSTRINGIFY(I40E_CLIENT_VERSION_BUILD)
+       __stringify(I40E_CLIENT_VERSION_MAJOR) "." \
+       __stringify(I40E_CLIENT_VERSION_MINOR) "." \
+       __stringify(I40E_CLIENT_VERSION_BUILD)
 
 struct i40e_client_version {
        u8 major;