On 5/18/21 6:20 PM, Greg Kroah-Hartman wrote:
> There is no need to store the dentry pointer for a debugfs file that we
> only use to remove it when the device goes away. debugfs can do the
> lookup for us instead, saving us some trouble, and making things smaller
> overall.
>
> Cc: Daniel Mack <daniel@xxxxxxxxxx>
Acked-by: Daniel Mack <daniel@xxxxxxxxxx>
Greg, can you take this via your tree?
Thanks,
Daniel
> Cc: Haojian Zhuang <haojian.zhuang@xxxxxxxxx>
> Cc: Robert Jarzmik <robert.jarzmik@xxxxxxx>
> Cc: Felipe Balbi <balbi@xxxxxxxxxx>
> Cc: linux-usb@xxxxxxxxxxxxxxx
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> drivers/usb/gadget/udc/pxa25x_udc.c | 4 ++--
> drivers/usb/gadget/udc/pxa25x_udc.h | 4 ----
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/usb/gadget/udc/pxa25x_udc.c b/drivers/usb/gadget/udc/pxa25x_udc.c
> index 10324a7334fe..69ef1e669d0c 100644
> --- a/drivers/usb/gadget/udc/pxa25x_udc.c
> +++ b/drivers/usb/gadget/udc/pxa25x_udc.c
> @@ -1338,10 +1338,10 @@ DEFINE_SHOW_ATTRIBUTE(udc_debug);
>
> #define create_debug_files(dev) \
> do { \
> - dev->debugfs_udc = debugfs_create_file(dev->gadget.name, \
> + debugfs_create_file(dev->gadget.name, \
> S_IRUGO, NULL, dev, &udc_debug_fops); \
> } while (0)
> -#define remove_debug_files(dev) debugfs_remove(dev->debugfs_udc)
> +#define remove_debug_files(dev) debugfs_remove(debugfs_lookup(dev->gadget.name, NULL))
>
> #else /* !CONFIG_USB_GADGET_DEBUG_FILES */
>
> diff --git a/drivers/usb/gadget/udc/pxa25x_udc.h b/drivers/usb/gadget/udc/pxa25x_udc.h
> index ccc6b921f067..aa4b68fd9fc0 100644
> --- a/drivers/usb/gadget/udc/pxa25x_udc.h
> +++ b/drivers/usb/gadget/udc/pxa25x_udc.h
> @@ -116,10 +116,6 @@ struct pxa25x_udc {
> struct usb_phy *transceiver;
> u64 dma_mask;
> struct pxa25x_ep ep [PXA_UDC_NUM_ENDPOINTS];
> -
> -#ifdef CONFIG_USB_GADGET_DEBUG_FS
> - struct dentry *debugfs_udc;
> -#endif
> void __iomem *regs;
> };
> #define to_pxa25x(g) (container_of((g), struct pxa25x_udc, gadget))
>
