| Message ID | 20240821121048.31566-3-liulei.rjpt@vivo.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | usb drivers use devm_clk_get_enabled() helpers | expand |
Hi Lei, kernel test robot noticed the following build errors: [auto build test ERROR on usb/usb-testing] [also build test ERROR on usb/usb-next usb/usb-linus linus/master v6.11-rc4 next-20240821] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Lei-Liu/usb-aspeed_udc-Use-devm_clk_get_enabled-helpers/20240821-201358 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing patch link: https://lore.kernel.org/r/20240821121048.31566-3-liulei.rjpt%40vivo.com patch subject: [PATCH 2/5] usb: pxa27x_udc: Use devm_clk_get_enabled() helpers config: x86_64-randconfig-161-20240822 (https://download.01.org/0day-ci/archive/20240822/202408221155.UveHbLu0-lkp@intel.com/config) compiler: clang version 18.1.5 (https://github.com/llvm/llvm-project 617a15a9eac96088ae5e9134248d8236e34b91b1) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240822/202408221155.UveHbLu0-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202408221155.UveHbLu0-lkp@intel.com/ All errors (new ones prefixed by >>): >> drivers/usb/gadget/udc/pxa27x_udc.c:2401:44: error: too many arguments to function call, expected single argument 'clk', have 2 arguments 2401 | udc->clk = clk_prepare_enable(&pdev->dev, NULL); | ~~~~~~~~~~~~~~~~~~ ^~~~ include/linux/stddef.h:8:14: note: expanded from macro 'NULL' 8 | #define NULL ((void *)0) | ^~~~~~~~~~~ include/linux/clk.h:1107:19: note: 'clk_prepare_enable' declared here 1107 | static inline int clk_prepare_enable(struct clk *clk) | ^ ~~~~~~~~~~~~~~~ 1 error generated. vim +/clk +2401 drivers/usb/gadget/udc/pxa27x_udc.c 2345 2346 /** 2347 * pxa_udc_probe - probes the udc device 2348 * @pdev: platform device 2349 * 2350 * Perform basic init : allocates udc clock, creates sysfs files, requests 2351 * irq. 2352 */ 2353 static int pxa_udc_probe(struct platform_device *pdev) 2354 { 2355 struct pxa_udc *udc = &memory; 2356 int retval = 0, gpio; 2357 struct pxa2xx_udc_mach_info *mach = dev_get_platdata(&pdev->dev); 2358 unsigned long gpio_flags; 2359 2360 if (mach) { 2361 gpio_flags = mach->gpio_pullup_inverted ? GPIOF_ACTIVE_LOW : 0; 2362 gpio = mach->gpio_pullup; 2363 if (gpio_is_valid(gpio)) { 2364 retval = devm_gpio_request_one(&pdev->dev, gpio, 2365 gpio_flags, 2366 "USB D+ pullup"); 2367 if (retval) 2368 return retval; 2369 udc->gpiod = gpio_to_desc(mach->gpio_pullup); 2370 } 2371 udc->udc_command = mach->udc_command; 2372 } else { 2373 udc->gpiod = devm_gpiod_get(&pdev->dev, NULL, GPIOD_ASIS); 2374 } 2375 2376 udc->regs = devm_platform_ioremap_resource(pdev, 0); 2377 if (IS_ERR(udc->regs)) 2378 return PTR_ERR(udc->regs); 2379 udc->irq = platform_get_irq(pdev, 0); 2380 if (udc->irq < 0) 2381 return udc->irq; 2382 2383 udc->dev = &pdev->dev; 2384 if (of_have_populated_dt()) { 2385 udc->transceiver = 2386 devm_usb_get_phy_by_phandle(udc->dev, "phys", 0); 2387 if (IS_ERR(udc->transceiver)) 2388 return PTR_ERR(udc->transceiver); 2389 } else { 2390 udc->transceiver = usb_get_phy(USB_PHY_TYPE_USB2); 2391 } 2392 2393 if (IS_ERR(udc->gpiod)) { 2394 dev_err(&pdev->dev, "Couldn't find or request D+ gpio : %ld\n", 2395 PTR_ERR(udc->gpiod)); 2396 return PTR_ERR(udc->gpiod); 2397 } 2398 if (udc->gpiod) 2399 gpiod_direction_output(udc->gpiod, 0); 2400 > 2401 udc->clk = clk_prepare_enable(&pdev->dev, NULL); 2402 if (IS_ERR(udc->clk)) 2403 return PTR_ERR(udc->clk); 2404 2405 udc->vbus_sensed = 0; 2406 2407 the_controller = udc; 2408 platform_set_drvdata(pdev, udc); 2409 udc_init_data(udc); 2410 2411 /* irq setup after old hardware state is cleaned up */ 2412 retval = devm_request_irq(&pdev->dev, udc->irq, pxa_udc_irq, 2413 IRQF_SHARED, driver_name, udc); 2414 if (retval != 0) { 2415 dev_err(udc->dev, "%s: can't get irq %i, err %d\n", 2416 driver_name, udc->irq, retval); 2417 goto err; 2418 } 2419 2420 if (!IS_ERR_OR_NULL(udc->transceiver)) 2421 usb_register_notifier(udc->transceiver, &pxa27x_udc_phy); 2422 retval = usb_add_gadget_udc(&pdev->dev, &udc->gadget); 2423 if (retval) 2424 goto err_add_gadget; 2425 2426 pxa_init_debugfs(udc); 2427 if (should_enable_udc(udc)) 2428 udc_enable(udc); 2429 return 0; 2430 2431 err_add_gadget: 2432 if (!IS_ERR_OR_NULL(udc->transceiver)) 2433 usb_unregister_notifier(udc->transceiver, &pxa27x_udc_phy); 2434 err: 2435 clk_unprepare(udc->clk); 2436 return retval; 2437 } 2438
Hi Lei,
kernel test robot noticed the following build errors:
[auto build test ERROR on usb/usb-testing]
[also build test ERROR on usb/usb-next usb/usb-linus linus/master v6.11-rc4 next-20240821]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Lei-Liu/usb-aspeed_udc-Use-devm_clk_get_enabled-helpers/20240821-201358
base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
patch link: https://lore.kernel.org/r/20240821121048.31566-3-liulei.rjpt%40vivo.com
patch subject: [PATCH 2/5] usb: pxa27x_udc: Use devm_clk_get_enabled() helpers
config: s390-allyesconfig (https://download.01.org/0day-ci/archive/20240822/202408221126.F1eulsSr-lkp@intel.com/config)
compiler: s390-linux-gcc (GCC) 14.1.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240822/202408221126.F1eulsSr-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202408221126.F1eulsSr-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/usb/gadget/udc/pxa27x_udc.c: In function 'pxa_udc_probe':
drivers/usb/gadget/udc/pxa27x_udc.c:2401:39: error: passing argument 1 of 'clk_prepare_enable' from incompatible pointer type [-Wincompatible-pointer-types]
2401 | udc->clk = clk_prepare_enable(&pdev->dev, NULL);
| ^~~~~~~~~~
| |
| struct device *
In file included from drivers/usb/gadget/udc/pxa27x_udc.c:18:
include/linux/clk.h:1107:50: note: expected 'struct clk *' but argument is of type 'struct device *'
1107 | static inline int clk_prepare_enable(struct clk *clk)
| ~~~~~~~~~~~~^~~
drivers/usb/gadget/udc/pxa27x_udc.c:2401:20: error: too many arguments to function 'clk_prepare_enable'
2401 | udc->clk = clk_prepare_enable(&pdev->dev, NULL);
| ^~~~~~~~~~~~~~~~~~
include/linux/clk.h:1107:19: note: declared here
1107 | static inline int clk_prepare_enable(struct clk *clk)
| ^~~~~~~~~~~~~~~~~~
>> drivers/usb/gadget/udc/pxa27x_udc.c:2401:18: error: assignment to 'struct clk *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
2401 | udc->clk = clk_prepare_enable(&pdev->dev, NULL);
| ^
vim +2401 drivers/usb/gadget/udc/pxa27x_udc.c
2345
2346 /**
2347 * pxa_udc_probe - probes the udc device
2348 * @pdev: platform device
2349 *
2350 * Perform basic init : allocates udc clock, creates sysfs files, requests
2351 * irq.
2352 */
2353 static int pxa_udc_probe(struct platform_device *pdev)
2354 {
2355 struct pxa_udc *udc = &memory;
2356 int retval = 0, gpio;
2357 struct pxa2xx_udc_mach_info *mach = dev_get_platdata(&pdev->dev);
2358 unsigned long gpio_flags;
2359
2360 if (mach) {
2361 gpio_flags = mach->gpio_pullup_inverted ? GPIOF_ACTIVE_LOW : 0;
2362 gpio = mach->gpio_pullup;
2363 if (gpio_is_valid(gpio)) {
2364 retval = devm_gpio_request_one(&pdev->dev, gpio,
2365 gpio_flags,
2366 "USB D+ pullup");
2367 if (retval)
2368 return retval;
2369 udc->gpiod = gpio_to_desc(mach->gpio_pullup);
2370 }
2371 udc->udc_command = mach->udc_command;
2372 } else {
2373 udc->gpiod = devm_gpiod_get(&pdev->dev, NULL, GPIOD_ASIS);
2374 }
2375
2376 udc->regs = devm_platform_ioremap_resource(pdev, 0);
2377 if (IS_ERR(udc->regs))
2378 return PTR_ERR(udc->regs);
2379 udc->irq = platform_get_irq(pdev, 0);
2380 if (udc->irq < 0)
2381 return udc->irq;
2382
2383 udc->dev = &pdev->dev;
2384 if (of_have_populated_dt()) {
2385 udc->transceiver =
2386 devm_usb_get_phy_by_phandle(udc->dev, "phys", 0);
2387 if (IS_ERR(udc->transceiver))
2388 return PTR_ERR(udc->transceiver);
2389 } else {
2390 udc->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
2391 }
2392
2393 if (IS_ERR(udc->gpiod)) {
2394 dev_err(&pdev->dev, "Couldn't find or request D+ gpio : %ld\n",
2395 PTR_ERR(udc->gpiod));
2396 return PTR_ERR(udc->gpiod);
2397 }
2398 if (udc->gpiod)
2399 gpiod_direction_output(udc->gpiod, 0);
2400
> 2401 udc->clk = clk_prepare_enable(&pdev->dev, NULL);
2402 if (IS_ERR(udc->clk))
2403 return PTR_ERR(udc->clk);
2404
2405 udc->vbus_sensed = 0;
2406
2407 the_controller = udc;
2408 platform_set_drvdata(pdev, udc);
2409 udc_init_data(udc);
2410
2411 /* irq setup after old hardware state is cleaned up */
2412 retval = devm_request_irq(&pdev->dev, udc->irq, pxa_udc_irq,
2413 IRQF_SHARED, driver_name, udc);
2414 if (retval != 0) {
2415 dev_err(udc->dev, "%s: can't get irq %i, err %d\n",
2416 driver_name, udc->irq, retval);
2417 goto err;
2418 }
2419
2420 if (!IS_ERR_OR_NULL(udc->transceiver))
2421 usb_register_notifier(udc->transceiver, &pxa27x_udc_phy);
2422 retval = usb_add_gadget_udc(&pdev->dev, &udc->gadget);
2423 if (retval)
2424 goto err_add_gadget;
2425
2426 pxa_init_debugfs(udc);
2427 if (should_enable_udc(udc))
2428 udc_enable(udc);
2429 return 0;
2430
2431 err_add_gadget:
2432 if (!IS_ERR_OR_NULL(udc->transceiver))
2433 usb_unregister_notifier(udc->transceiver, &pxa27x_udc_phy);
2434 err:
2435 clk_unprepare(udc->clk);
2436 return retval;
2437 }
2438
On Wed, Aug 21, 2024 at 08:10:40PM +0800, Lei Liu wrote: > The devm_clk_get_enabled() helpers: > - call devm_clk_get() > - call clk_prepare_enable() and register what is needed in order to > call clk_disable_unprepare() when needed, as a managed resource. > > This simplifies the code and avoids calls to clk_disable_unprepare(). > > Signed-off-by: Lei Liu <liulei.rjpt@vivo.com> > --- > drivers/usb/gadget/udc/pxa27x_udc.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c > index 1a6317e4b2a3..6e99e75f1acb 100644 > --- a/drivers/usb/gadget/udc/pxa27x_udc.c > +++ b/drivers/usb/gadget/udc/pxa27x_udc.c > @@ -2398,14 +2398,10 @@ static int pxa_udc_probe(struct platform_device *pdev) > if (udc->gpiod) > gpiod_direction_output(udc->gpiod, 0); > > - udc->clk = devm_clk_get(&pdev->dev, NULL); > + udc->clk = clk_prepare_enable(&pdev->dev, NULL); You didn't test build this code :(
diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c index 1a6317e4b2a3..6e99e75f1acb 100644 --- a/drivers/usb/gadget/udc/pxa27x_udc.c +++ b/drivers/usb/gadget/udc/pxa27x_udc.c @@ -2398,14 +2398,10 @@ static int pxa_udc_probe(struct platform_device *pdev) if (udc->gpiod) gpiod_direction_output(udc->gpiod, 0); - udc->clk = devm_clk_get(&pdev->dev, NULL); + udc->clk = clk_prepare_enable(&pdev->dev, NULL); if (IS_ERR(udc->clk)) return PTR_ERR(udc->clk); - retval = clk_prepare(udc->clk); - if (retval) - return retval; - udc->vbus_sensed = 0; the_controller = udc;
The devm_clk_get_enabled() helpers: - call devm_clk_get() - call clk_prepare_enable() and register what is needed in order to call clk_disable_unprepare() when needed, as a managed resource. This simplifies the code and avoids calls to clk_disable_unprepare(). Signed-off-by: Lei Liu <liulei.rjpt@vivo.com> --- drivers/usb/gadget/udc/pxa27x_udc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)