Commit 4e68adfe authored by Jingjing Wu's avatar Jingjing Wu Committed by Jeff Kirsher

i40e/i40evf: Fix compile issue related to const string

Add const to functions that return strings that aren't going to be
modified. This addresses some reported compile complaints.

Change-ID: Ic56b1e814ab4d23a50480e7fdec652445f776ee8
Signed-off-by: default avatarJingjing Wu <jingjing.wu@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 6dec1017
...@@ -87,7 +87,7 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) ...@@ -87,7 +87,7 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw)
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
* @aq_err: the AQ error code to convert * @aq_err: the AQ error code to convert
**/ **/
char *i40e_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err) const char *i40e_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err)
{ {
switch (aq_err) { switch (aq_err) {
case I40E_AQ_RC_OK: case I40E_AQ_RC_OK:
...@@ -147,7 +147,7 @@ char *i40e_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err) ...@@ -147,7 +147,7 @@ char *i40e_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err)
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
* @stat_err: the status error code to convert * @stat_err: the status error code to convert
**/ **/
char *i40e_stat_str(struct i40e_hw *hw, i40e_status stat_err) const char *i40e_stat_str(struct i40e_hw *hw, i40e_status stat_err)
{ {
switch (stat_err) { switch (stat_err) {
case 0: case 0:
......
...@@ -632,7 +632,7 @@ static inline u8 i40e_nvmupd_get_transaction(u32 val) ...@@ -632,7 +632,7 @@ static inline u8 i40e_nvmupd_get_transaction(u32 val)
return (u8)((val & I40E_NVM_TRANS_MASK) >> I40E_NVM_TRANS_SHIFT); return (u8)((val & I40E_NVM_TRANS_MASK) >> I40E_NVM_TRANS_SHIFT);
} }
static char *i40e_nvm_update_state_str[] = { static const char * const i40e_nvm_update_state_str[] = {
"I40E_NVMUPD_INVALID", "I40E_NVMUPD_INVALID",
"I40E_NVMUPD_READ_CON", "I40E_NVMUPD_READ_CON",
"I40E_NVMUPD_READ_SNT", "I40E_NVMUPD_READ_SNT",
......
...@@ -58,8 +58,8 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, ...@@ -58,8 +58,8 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask,
void i40e_idle_aq(struct i40e_hw *hw); void i40e_idle_aq(struct i40e_hw *hw);
bool i40e_check_asq_alive(struct i40e_hw *hw); bool i40e_check_asq_alive(struct i40e_hw *hw);
i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw, bool unloading); i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw, bool unloading);
char *i40e_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err); const char *i40e_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err);
char *i40e_stat_str(struct i40e_hw *hw, i40e_status stat_err); const char *i40e_stat_str(struct i40e_hw *hw, i40e_status stat_err);
i40e_status i40e_aq_get_rss_lut(struct i40e_hw *hw, u16 seid, i40e_status i40e_aq_get_rss_lut(struct i40e_hw *hw, u16 seid,
bool pf_lut, u8 *lut, u16 lut_size); bool pf_lut, u8 *lut, u16 lut_size);
......
...@@ -87,7 +87,7 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw) ...@@ -87,7 +87,7 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw)
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
* @aq_err: the AQ error code to convert * @aq_err: the AQ error code to convert
**/ **/
char *i40evf_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err) const char *i40evf_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err)
{ {
switch (aq_err) { switch (aq_err) {
case I40E_AQ_RC_OK: case I40E_AQ_RC_OK:
...@@ -147,7 +147,7 @@ char *i40evf_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err) ...@@ -147,7 +147,7 @@ char *i40evf_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err)
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
* @stat_err: the status error code to convert * @stat_err: the status error code to convert
**/ **/
char *i40evf_stat_str(struct i40e_hw *hw, i40e_status stat_err) const char *i40evf_stat_str(struct i40e_hw *hw, i40e_status stat_err)
{ {
switch (stat_err) { switch (stat_err) {
case 0: case 0:
......
...@@ -60,8 +60,8 @@ void i40e_idle_aq(struct i40e_hw *hw); ...@@ -60,8 +60,8 @@ void i40e_idle_aq(struct i40e_hw *hw);
void i40evf_resume_aq(struct i40e_hw *hw); void i40evf_resume_aq(struct i40e_hw *hw);
bool i40evf_check_asq_alive(struct i40e_hw *hw); bool i40evf_check_asq_alive(struct i40e_hw *hw);
i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw, bool unloading); i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw, bool unloading);
char *i40evf_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err); const char *i40evf_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err);
char *i40evf_stat_str(struct i40e_hw *hw, i40e_status stat_err); const char *i40evf_stat_str(struct i40e_hw *hw, i40e_status stat_err);
i40e_status i40evf_aq_get_rss_lut(struct i40e_hw *hw, u16 seid, i40e_status i40evf_aq_get_rss_lut(struct i40e_hw *hw, u16 seid,
bool pf_lut, u8 *lut, u16 lut_size); bool pf_lut, u8 *lut, u16 lut_size);
......
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