From 7b62483f64dd61e6483c75b514c821fe0e339af3 Mon Sep 17 00:00:00 2001 From: Shiraz Saleem Date: Wed, 24 Nov 2021 06:41:35 -0600 Subject: [PATCH 1/2] net/ice: Fix boolean assignment vbool in ice_devlink_enable_roce_get can be assigned to a non-0/1 constant. Fix this assignment of vbool to be 0/1. Fixes: e523af4ee560 ("net/ice: Add support for enable_iwarp and enable_roce devlink param") Suggested-by: Parav Pandit Signed-off-by: Shiraz Saleem Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/ice/ice_devlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c b/drivers/net/ethernet/intel/ice/ice_devlink.c index 478412b28a761..1cfe918db8b9b 100644 --- a/drivers/net/ethernet/intel/ice/ice_devlink.c +++ b/drivers/net/ethernet/intel/ice/ice_devlink.c @@ -436,7 +436,7 @@ ice_devlink_enable_roce_get(struct devlink *devlink, u32 id, { struct ice_pf *pf = devlink_priv(devlink); - ctx->val.vbool = pf->rdma_mode & IIDC_RDMA_PROTOCOL_ROCEV2; + ctx->val.vbool = pf->rdma_mode & IIDC_RDMA_PROTOCOL_ROCEV2 ? true : false; return 0; } From 244714da8d5d088faa2e0e32ba84ca1913a093ef Mon Sep 17 00:00:00 2001 From: Shiraz Saleem Date: Wed, 24 Nov 2021 06:41:36 -0600 Subject: [PATCH 2/2] net/ice: Remove unused enum Remove ice_devlink_param_id enum as its not used. Suggested-by: Parav Pandit Signed-off-by: Shiraz Saleem Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/ice/ice_devlink.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.h b/drivers/net/ethernet/intel/ice/ice_devlink.h index faea757fcf5db..fe006d9946f86 100644 --- a/drivers/net/ethernet/intel/ice/ice_devlink.h +++ b/drivers/net/ethernet/intel/ice/ice_devlink.h @@ -4,10 +4,6 @@ #ifndef _ICE_DEVLINK_H_ #define _ICE_DEVLINK_H_ -enum ice_devlink_param_id { - ICE_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX, -}; - struct ice_pf *ice_allocate_pf(struct device *dev); void ice_devlink_register(struct ice_pf *pf);