usb: mtu3: allocate phys with ssusb
Subsystems (3)
PATCH v2 1/1 usb: mtu3: allocate phys with ssusb
Use a flexible array member to combine allocations. Slightly more efficient to have a single allocation like this.
Add __counted_by for extra runtime analysis.
Signed-off-by Rosen Penev <[email protected]>
---
v2: add max() call to prevent negative values.
drivers/usb/mtu3/mtu3.h | 2 +- drivers/usb/mtu3/mtu3_plat.c | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-)
drivers/usb/mtu3/mtu3.h +1 -1
@@ -252,7 +252,6 @@ struct ssusb_mtk {struct mtu3 *u3d;void __iomem *mac_base;void __iomem *ippc_base; -struct phy **phys;int num_phys;int wakeup_irq;/* common power & clock */
@@ -272,6 +271,7 @@ struct ssusb_mtk {struct regmap *uwk;u32 uwk_reg_base;u32 uwk_vers; + struct phy *phys[] __counted_by(num_phys); };/**
drivers/usb/mtu3/mtu3_plat.c +7 -12
@@ -240,17 +240,6 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)if (ret)return ret; - ssusb->num_phys =of_count_phandle_with_args (node, -"phys" ,"#phy-cells" ); -if (ssusb->num_phys >0 ) { - ssusb->phys =devm_kcalloc (dev, ssusb->num_phys, -sizeof (*ssusb->phys),GFP_KERNEL ); -if (!ssusb->phys) -return -ENOMEM ; - }else { - ssusb->num_phys =0 ; - } -for (i =0 ; i < ssusb->num_phys; i++) { ssusb->phys[i] =devm_of_phy_get_by_index (dev, node, i);if (IS_ERR (ssusb->phys[i])) {
@@ -330,12 +319,18 @@ static int mtu3_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct ssusb_mtk *ssusb;int ret = -ENOMEM ; +int num_phys; + num_phys =of_count_phandle_with_args (dev->of_node, +"phys" ,"#phy-cells" ); + num_phys =max (0 , num_phys);/* all elements are set to ZERO as default value */ - ssusb =devm_kzalloc (dev,sizeof (*ssusb),GFP_KERNEL ); + ssusb =devm_kzalloc (dev,struct_size (ssusb, phys, num_phys),GFP_KERNEL );if (!ssusb)return -ENOMEM ; + ssusb->num_phys = num_phys; + ret =dma_set_mask_and_coherent (dev,DMA_BIT_MASK (32 ));if (ret) {dev_err (dev,"No suitable DMA config available\n" );
Signature · 1 line
2.55.0
Greg Kroah-Hartman
maintainerQuoted 8 lines · Rosen Penev
Use a flexible array member to combine allocations. Slightly more efficient to have a single allocation like this.
Add
__counted_byfor extra runtime analysis.Signed-off-by Rosen Penev <[email protected]>---
v2: addmax()call to prevent negative values.
That is NOT the correct solution at all. Please do not just throw away error values and assume all will be fine.
greg k-h