0008-fotg210-udc-Use-dev-pointer-in-probe-and-dev_message.patch 2.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. From 27cd321a365fecac857e41ad1681062994142e4a Mon Sep 17 00:00:00 2001
  2. From: Linus Walleij <[email protected]>
  3. Date: Mon, 14 Nov 2022 12:51:58 +0100
  4. Subject: [PATCH 08/29] fotg210-udc: Use dev pointer in probe and dev_messages
  5. Add a local struct device *dev pointer and use dev_err()
  6. etc to report status.
  7. Signed-off-by: Linus Walleij <[email protected]>
  8. Link: https://lore.kernel.org/r/[email protected]
  9. Signed-off-by: Greg Kroah-Hartman <[email protected]>
  10. ---
  11. --- a/drivers/usb/fotg210/fotg210-udc.c
  12. +++ b/drivers/usb/fotg210/fotg210-udc.c
  13. @@ -1104,6 +1104,7 @@ int fotg210_udc_probe(struct platform_de
  14. struct resource *res, *ires;
  15. struct fotg210_udc *fotg210 = NULL;
  16. struct fotg210_ep *_ep[FOTG210_MAX_NUM_EP];
  17. + struct device *dev = &pdev->dev;
  18. int ret = 0;
  19. int i;
  20. @@ -1135,7 +1136,7 @@ int fotg210_udc_probe(struct platform_de
  21. fotg210->reg = ioremap(res->start, resource_size(res));
  22. if (fotg210->reg == NULL) {
  23. - pr_err("ioremap error.\n");
  24. + dev_err(dev, "ioremap error\n");
  25. goto err_alloc;
  26. }
  27. @@ -1146,8 +1147,8 @@ int fotg210_udc_probe(struct platform_de
  28. fotg210->gadget.ops = &fotg210_gadget_ops;
  29. fotg210->gadget.max_speed = USB_SPEED_HIGH;
  30. - fotg210->gadget.dev.parent = &pdev->dev;
  31. - fotg210->gadget.dev.dma_mask = pdev->dev.dma_mask;
  32. + fotg210->gadget.dev.parent = dev;
  33. + fotg210->gadget.dev.dma_mask = dev->dma_mask;
  34. fotg210->gadget.name = udc_name;
  35. INIT_LIST_HEAD(&fotg210->gadget.ep_list);
  36. @@ -1195,15 +1196,15 @@ int fotg210_udc_probe(struct platform_de
  37. ret = request_irq(ires->start, fotg210_irq, IRQF_SHARED,
  38. udc_name, fotg210);
  39. if (ret < 0) {
  40. - pr_err("request_irq error (%d)\n", ret);
  41. + dev_err(dev, "request_irq error (%d)\n", ret);
  42. goto err_req;
  43. }
  44. - ret = usb_add_gadget_udc(&pdev->dev, &fotg210->gadget);
  45. + ret = usb_add_gadget_udc(dev, &fotg210->gadget);
  46. if (ret)
  47. goto err_add_udc;
  48. - dev_info(&pdev->dev, "version %s\n", DRIVER_VERSION);
  49. + dev_info(dev, "version %s\n", DRIVER_VERSION);
  50. return 0;