usb: bdc: allocate phys with main struct
Subsystems (2)
PATCH 1/1 usb: bdc: allocate phys with main struct
Use a flexible array member to combine allocations and simplify code slightly. No need for a branch deciding whether to allocate or not.
Add __counted_by for extra runtime analysis.
--- drivers/usb/gadget/udc/bdc/bdc.h | 2 +- drivers/usb/gadget/udc/bdc/bdc_core.c | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-)
drivers/usb/gadget/udc/bdc/bdc.h +1 -1
@@ -409,7 +409,6 @@ struct bdc {spinlock_t lock;/* generic phy */ -struct phy **phys;int num_phys;/* num of endpoints for a particular instantiation of IP */ unsigned int num_eps;
@@ -453,6 +452,7 @@ struct bdc {*/ struct delayed_work func_wake_notify;struct clk *clk; + struct phy *phys[] __counted_by(num_phys); };static inline u32 bdc_readl (void __iomem *base,u32 offset)
drivers/usb/gadget/udc/bdc/bdc_core.c +7 -13
@@ -487,14 +487,20 @@ static int bdc_probe(struct platform_device *pdev)int irq;u32 temp;struct device *dev = &pdev->dev; +int num_phys;int phy_num;dev_dbg (dev,"%s()\n" , __func__); - bdc =devm_kzalloc (dev,sizeof (*bdc),GFP_KERNEL ); + num_phys =of_count_phandle_with_args (dev->of_node, +"phys" ,"#phy-cells" ); + bdc =devm_kzalloc (dev,struct_size (bdc, phys, num_phys),GFP_KERNEL );if (!bdc)return -ENOMEM ; + bdc->num_phys = num_phys; +dev_info (dev,"Using %d phy(s)\n" , bdc->num_phys); + bdc->regs =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (bdc->regs))return PTR_ERR (bdc->regs);
@@ -508,18 +514,6 @@ static int bdc_probe(struct platform_device *pdev) bdc->dev = dev;dev_dbg (dev,"bdc->regs: %p irq=%d\n" , bdc->regs, bdc->irq); - bdc->num_phys =of_count_phandle_with_args (dev->of_node, -"phys" ,"#phy-cells" ); -if (bdc->num_phys >0 ) { - bdc->phys =devm_kcalloc (dev, bdc->num_phys, -sizeof (struct phy *),GFP_KERNEL ); -if (!bdc->phys) -return -ENOMEM ; - }else { - bdc->num_phys =0 ; - } -dev_info (dev,"Using %d phy(s)\n" , bdc->num_phys); -for (phy_num =0 ; phy_num < bdc->num_phys; phy_num++) { bdc->phys[phy_num] =devm_of_phy_get_by_index ( dev, dev->of_node, phy_num);
Signature · 1 line
2.53.0
Justin Chen
maintainerQuoted 44 lines · Rosen Penev
Use a flexible array member to combine allocations and simplify code slightly. No need for a branch deciding whether to allocate or not.
Add
__counted_byfor extra runtime analysis.Signed-off-by Rosen Penev <[email protected]>--- drivers/usb/gadget/udc/bdc/bdc.h | 2 +- drivers/usb/gadget/udc/bdc/bdc_core.c | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-)drivers/usb/gadget/udc/bdc/bdc.h +1
-1@@ -409,7 +409,6 @@ struct bdc {spinlock_t lock;/* generic phy */ -struct phy **phys;int num_phys;/* num of endpoints for a particular instantiation of IP */ unsigned int num_eps;@@ -453,6 +452,7 @@ struct bdc {*/ struct delayed_work func_wake_notify;struct clk *clk; + struct phy *phys[] __counted_by(num_phys); };static inline u32 bdc_readl (void __iomem *base,u32 offset)drivers/usb/gadget/udc/bdc/bdc_core.c +1
-0@@ -487,14 +487,20 @@ static int bdc_probe(struct platform_device *pdev)int irq;u32 temp;struct device *dev = &pdev->dev; +int num_phys;int phy_num;dev_dbg (dev,"%s()\n" , __func__);
drivers/usb/gadget/udc/bdc/bdc_core.c static int bdc_probe(struct platform_device *pdev) · line 503
Quoted 10 lines
drivers/usb/gadget/udc/bdc/bdc_core.c +6
-1- bdc =devm_kzalloc (dev,sizeof (*bdc),GFP_KERNEL ); + num_phys =of_count_phandle_with_args (dev->of_node, +"phys" ,"#phy-cells" ); + bdc =devm_kzalloc (dev,struct_size (bdc, phys, num_phys),GFP_KERNEL );if (!bdc)return -ENOMEM ; + bdc->num_phys = num_phys; +dev_info (dev,"Using %d phy(s)\n" , bdc->num_phys); +
This feels like a step sideways instead of an improvement IMHO. And we are also moving the allocation and dev_info() print. Is there a reason to change the ordering?
Justin
Quoted 22 lines
drivers/usb/gadget/udc/bdc/bdc_core.c +0
-12bdc->regs =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (bdc->regs))return PTR_ERR (bdc->regs);@@ -508,18 +514,6 @@ static int bdc_probe(struct platform_device *pdev) bdc->dev = dev;dev_dbg (dev,"bdc->regs: %p irq=%d\n" , bdc->regs, bdc->irq); - bdc->num_phys =of_count_phandle_with_args (dev->of_node, -"phys" ,"#phy-cells" ); -if (bdc->num_phys >0 ) { - bdc->phys =devm_kcalloc (dev, bdc->num_phys, -sizeof (struct phy *),GFP_KERNEL ); -if (!bdc->phys) -return -ENOMEM ; - }else { - bdc->num_phys =0 ; - } -dev_info (dev,"Using %d phy(s)\n" , bdc->num_phys); -for (phy_num =0 ; phy_num < bdc->num_phys; phy_num++) { bdc->phys[phy_num] =devm_of_phy_get_by_index ( dev, dev->of_node, phy_num);
Quoted 55 lines · Justin Chen
Quoted 51 lines · Rosen Penev
Use a flexible array member to combine allocations and simplify code slightly. No need for a branch deciding whether to allocate or not.
Add
__counted_byfor extra runtime analysis.Signed-off-by Rosen Penev <[email protected]>--- drivers/usb/gadget/udc/bdc/bdc.h | 2 +- drivers/usb/gadget/udc/bdc/bdc_core.c | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-)drivers/usb/gadget/udc/bdc/bdc.h +1
-1@@ -409,7 +409,6 @@ struct bdc {spinlock_t lock;/* generic phy */ -struct phy **phys;int num_phys;/* num of endpoints for a particular instantiation of IP */ unsigned int num_eps;@@ -453,6 +452,7 @@ struct bdc {*/ struct delayed_work func_wake_notify;struct clk *clk; + struct phy *phys[] __counted_by(num_phys); };static inline u32 bdc_readl (void __iomem *base,u32 offset)drivers/usb/gadget/udc/bdc/bdc_core.c +4
-1@@ -487,14 +487,20 @@ static int bdc_probe(struct platform_device *pdev)int irq;u32 temp;struct device *dev = &pdev->dev; +int num_phys;int phy_num;dev_dbg (dev,"%s()\n" , __func__); - bdc =devm_kzalloc (dev,sizeof (*bdc),GFP_KERNEL ); + num_phys =of_count_phandle_with_args (dev->of_node, +"phys" ,"#phy-cells" ); + bdc =devm_kzalloc (dev,struct_size (bdc, phys, num_phys),GFP_KERNEL );if (!bdc)return -ENOMEM ;
Quoted 7 lines
drivers/usb/gadget/udc/bdc/bdc_core.c static int bdc_probe(struct platform_device *pdev) · line 503
Quoted 3 lines
drivers/usb/gadget/udc/bdc/bdc_core.c +3
-0+ bdc->num_phys = num_phys; +dev_info (dev,"Using %d phy(s)\n" , bdc->num_phys); +This feels like a step sideways instead of an improvement IMHO. And we are also moving the allocation and
dev_info()print. Is there a reason to change the ordering?
Of the allocation, yes since we need the size.
Of the dev_info, no. I can move it back.
Quoted 26 lines
Justin
Quoted 22 lines
drivers/usb/gadget/udc/bdc/bdc_core.c +0
-12bdc->regs =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (bdc->regs))return PTR_ERR (bdc->regs);@@ -508,18 +514,6 @@ static int bdc_probe(struct platform_device *pdev) bdc->dev = dev;dev_dbg (dev,"bdc->regs: %p irq=%d\n" , bdc->regs, bdc->irq); - bdc->num_phys =of_count_phandle_with_args (dev->of_node, -"phys" ,"#phy-cells" ); -if (bdc->num_phys >0 ) { - bdc->phys =devm_kcalloc (dev, bdc->num_phys, -sizeof (struct phy *),GFP_KERNEL ); -if (!bdc->phys) -return -ENOMEM ; - }else { - bdc->num_phys =0 ; - } -dev_info (dev,"Using %d phy(s)\n" , bdc->num_phys); -for (phy_num =0 ; phy_num < bdc->num_phys; phy_num++) { bdc->phys[phy_num] =devm_of_phy_get_by_index ( dev, dev->of_node, phy_num);