path: root/drivers/rapidio
diff options
authorGustavo A. R. Silva <>2020-08-11 18:36:40 -0700
committerLinus Torvalds <>2020-08-12 10:58:01 -0700
commit330d5589604d7c1d08caa097a97690d2e8c5bb3f (patch)
treecb9f230563bc7f6f8477b0bea2d2756b48f6d563 /drivers/rapidio
parent216ec27f3c5215d357f351fa103817c8b62ea804 (diff)
drivers/rapidio/rio-scan.c: use struct_size() helper
Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes. Also, while there, use the preferred form for passing a size of a struct. The alternative form where struct name is spelled out hurts readability and introduces an opportunity for a bug when the pointer variable type is changed but the corresponding sizeof that is passed as argument is not. This issue was found with the help of Coccinelle and, audited and fixed manually. Addresses KSPP ID: Signed-off-by: Gustavo A. R. Silva <> Signed-off-by: Andrew Morton <> Cc: Matt Porter <> Cc: Alexandre Bounine <> Link: Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'drivers/rapidio')
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index eb8ed28533f8..19b0c33f4a62 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -330,7 +330,7 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
size_t size;
u32 swpinfo = 0;
- size = sizeof(struct rio_dev);
+ size = sizeof(*rdev);
if (rio_mport_read_config_32(port, destid, hopcount,
RIO_PEF_CAR, &result))
return NULL;
@@ -338,10 +338,8 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
rio_mport_read_config_32(port, destid, hopcount,
RIO_SWP_INFO_CAR, &swpinfo);
- if (result & RIO_PEF_SWITCH) {
- size += (RIO_GET_TOTAL_PORTS(swpinfo) *
- sizeof(rswitch->nextdev[0])) + sizeof(*rswitch);
- }
+ if (result & RIO_PEF_SWITCH)
+ size += struct_size(rswitch, nextdev, RIO_GET_TOTAL_PORTS(swpinfo));
rdev = kzalloc(size, GFP_KERNEL);