From: Mateusz Palczewski Date: Thu, 3 Feb 2022 10:25:18 +0000 (+0100) Subject: iavf: Remove non-inclusive language X-Git-Tag: v5.18-rc1~136^2~214^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a62b2098987ca690070eff2374eee126118af77;p=thirdparty%2Fkernel%2Flinux.git iavf: Remove non-inclusive language Remove non-inclusive language from the iavf driver. Signed-off-by: Aleksandr Loktionov Signed-off-by: Mateusz Palczewski Signed-off-by: Tony Nguyen --- diff --git a/drivers/net/ethernet/intel/iavf/iavf_common.c b/drivers/net/ethernet/intel/iavf/iavf_common.c index e9cc7f6ddc466..34e46a23894f4 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_common.c +++ b/drivers/net/ethernet/intel/iavf/iavf_common.c @@ -131,8 +131,8 @@ const char *iavf_stat_str(struct iavf_hw *hw, enum iavf_status stat_err) return "IAVF_ERR_INVALID_MAC_ADDR"; case IAVF_ERR_DEVICE_NOT_SUPPORTED: return "IAVF_ERR_DEVICE_NOT_SUPPORTED"; - case IAVF_ERR_MASTER_REQUESTS_PENDING: - return "IAVF_ERR_MASTER_REQUESTS_PENDING"; + case IAVF_ERR_PRIMARY_REQUESTS_PENDING: + return "IAVF_ERR_PRIMARY_REQUESTS_PENDING"; case IAVF_ERR_INVALID_LINK_SETTINGS: return "IAVF_ERR_INVALID_LINK_SETTINGS"; case IAVF_ERR_AUTONEG_NOT_COMPLETE: diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index 2d355a7383a46..56387cec024f4 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -90,7 +90,7 @@ int iavf_status_to_errno(enum iavf_status status) case IAVF_ERR_UNKNOWN_PHY: case IAVF_ERR_LINK_SETUP: case IAVF_ERR_ADAPTER_STOPPED: - case IAVF_ERR_MASTER_REQUESTS_PENDING: + case IAVF_ERR_PRIMARY_REQUESTS_PENDING: case IAVF_ERR_AUTONEG_NOT_COMPLETE: case IAVF_ERR_RESET_FAILED: case IAVF_ERR_BAD_PTR: diff --git a/drivers/net/ethernet/intel/iavf/iavf_status.h b/drivers/net/ethernet/intel/iavf/iavf_status.h index 46e3d1f6b6048..2ea5c7c339bcc 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_status.h +++ b/drivers/net/ethernet/intel/iavf/iavf_status.h @@ -18,7 +18,7 @@ enum iavf_status { IAVF_ERR_ADAPTER_STOPPED = -9, IAVF_ERR_INVALID_MAC_ADDR = -10, IAVF_ERR_DEVICE_NOT_SUPPORTED = -11, - IAVF_ERR_MASTER_REQUESTS_PENDING = -12, + IAVF_ERR_PRIMARY_REQUESTS_PENDING = -12, IAVF_ERR_INVALID_LINK_SETTINGS = -13, IAVF_ERR_AUTONEG_NOT_COMPLETE = -14, IAVF_ERR_RESET_FAILED = -15,