Change the type used for VME slot numbers from int to u32 throughout vme driver. This modification more accurately represents the nature of slot numbers which are always non-negative. The changes include - Updating variable declarations - Modifying function signatures and return types This change imporves type safety, prevents potential issues with sign conversion. Signed-off-by: Riyan Dhiman <riyandhiman14@xxxxxxxxx> --- drivers/staging/vme_user/vme.c | 2 +- drivers/staging/vme_user/vme.h | 4 ++-- drivers/staging/vme_user/vme_bridge.h | 2 +- drivers/staging/vme_user/vme_fake.c | 2 +- drivers/staging/vme_user/vme_tsi148.c | 4 ++-- drivers/staging/vme_user/vme_user.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/vme_user/vme.c b/drivers/staging/vme_user/vme.c index 42304c9f83a2..aa3be2d7248d 100644 --- a/drivers/staging/vme_user/vme.c +++ b/drivers/staging/vme_user/vme.c @@ -1696,7 +1696,7 @@ EXPORT_SYMBOL(vme_lm_free); * or the function is not supported. Hardware specific errors may also * be returned. */ -int vme_slot_num(struct vme_dev *vdev) +u32 vme_slot_num(struct vme_dev *vdev) { struct vme_bridge *bridge; diff --git a/drivers/staging/vme_user/vme.h b/drivers/staging/vme_user/vme.h index 7753e736f9fd..66388767b6c7 100644 --- a/drivers/staging/vme_user/vme.h +++ b/drivers/staging/vme_user/vme.h @@ -102,7 +102,7 @@ extern const struct bus_type vme_bus_type; * @bridge_list: List of devices (per bridge) */ struct vme_dev { - int num; + u32 num; struct vme_bridge *bridge; struct device dev; struct list_head drv_list; @@ -179,7 +179,7 @@ int vme_lm_attach(struct vme_resource *, int, void (*callback)(void *), void *); int vme_lm_detach(struct vme_resource *, int); void vme_lm_free(struct vme_resource *); -int vme_slot_num(struct vme_dev *); +u32 vme_slot_num(struct vme_dev *); int vme_bus_num(struct vme_dev *); int vme_register_driver(struct vme_driver *, unsigned int); diff --git a/drivers/staging/vme_user/vme_bridge.h b/drivers/staging/vme_user/vme_bridge.h index 9bdc41bb6602..6778447eadfb 100644 --- a/drivers/staging/vme_user/vme_bridge.h +++ b/drivers/staging/vme_user/vme_bridge.h @@ -160,7 +160,7 @@ struct vme_bridge { int (*lm_detach)(struct vme_lm_resource *, int); /* CR/CSR space functions */ - int (*slot_get)(struct vme_bridge *); + u32 (*slot_get)(struct vme_bridge *); /* Bridge parent interface */ void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *dma); diff --git a/drivers/staging/vme_user/vme_fake.c b/drivers/staging/vme_user/vme_fake.c index 7f84d1c86f29..81601bfa4155 100644 --- a/drivers/staging/vme_user/vme_fake.c +++ b/drivers/staging/vme_user/vme_fake.c @@ -987,7 +987,7 @@ static int fake_lm_detach(struct vme_lm_resource *lm, int monitor) /* * Determine Geographical Addressing */ -static int fake_slot_get(struct vme_bridge *fake_bridge) +static u32 fake_slot_get(struct vme_bridge *fake_bridge) { return geoid; } diff --git a/drivers/staging/vme_user/vme_tsi148.c b/drivers/staging/vme_user/vme_tsi148.c index d81be8e4ceba..65237fb12466 100644 --- a/drivers/staging/vme_user/vme_tsi148.c +++ b/drivers/staging/vme_user/vme_tsi148.c @@ -2109,7 +2109,7 @@ static int tsi148_lm_detach(struct vme_lm_resource *lm, int monitor) /* * Determine Geographical Addressing */ -static int tsi148_slot_get(struct vme_bridge *tsi148_bridge) +static u32 tsi148_slot_get(struct vme_bridge *tsi148_bridge) { u32 slot = 0; struct tsi148_driver *bridge; @@ -2123,7 +2123,7 @@ static int tsi148_slot_get(struct vme_bridge *tsi148_bridge) slot = geoid; } - return (int)slot; + return slot; } static void *tsi148_alloc_consistent(struct device *parent, size_t size, diff --git a/drivers/staging/vme_user/vme_user.c b/drivers/staging/vme_user/vme_user.c index 5829a4141561..63f8efc19324 100644 --- a/drivers/staging/vme_user/vme_user.c +++ b/drivers/staging/vme_user/vme_user.c @@ -506,7 +506,7 @@ static int vme_user_match(struct vme_dev *vdev) int i; int cur_bus = vme_bus_num(vdev); - int cur_slot = vme_slot_num(vdev); + u32 cur_slot = vme_slot_num(vdev); for (i = 0; i < bus_num; i++) if ((cur_bus == bus[i]) && (cur_slot == vdev->num)) -- 2.46.0