2020-11-06 11:50:14

by Pawel Laszczak

Subject: [PATCH v2 09/10] usb: cdns3: Change file names for cdns3 driver.

Patch adds prefix cdns3- to all file names related only to
cdsn3 driver.

Signed-off-by: Pawel Laszczak <[email protected]>
---
drivers/usb/cdns3/Makefile | 6 +++---
drivers/usb/cdns3/{debug.h => cdns3-debug.h} | 0
drivers/usb/cdns3/{ep0.c => cdns3-ep0.c} | 4 ++--
drivers/usb/cdns3/{gadget.c => cdns3-gadget.c} | 4 ++--
drivers/usb/cdns3/{gadget.h => cdns3-gadget.h} | 0
drivers/usb/cdns3/{trace.c => cdns3-trace.c} | 2 +-
drivers/usb/cdns3/{trace.h => cdns3-trace.h} | 6 +++---
7 files changed, 11 insertions(+), 11 deletions(-)
rename drivers/usb/cdns3/{debug.h => cdns3-debug.h} (100%)
rename drivers/usb/cdns3/{ep0.c => cdns3-ep0.c} (99%)
rename drivers/usb/cdns3/{gadget.c => cdns3-gadget.c} (99%)
rename drivers/usb/cdns3/{gadget.h => cdns3-gadget.h} (100%)
rename drivers/usb/cdns3/{trace.c => cdns3-trace.c} (89%)
rename drivers/usb/cdns3/{trace.h => cdns3-trace.h} (99%)

diff --git a/drivers/usb/cdns3/Makefile b/drivers/usb/cdns3/Makefile
index a4fdaabdbe18..01a9a9620044 100644
--- a/drivers/usb/cdns3/Makefile
+++ b/drivers/usb/cdns3/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
# define_trace.h needs to know how to find our header
-CFLAGS_trace.o := -I$(src)
+CFLAGS_cdns3-trace.o := -I$(src)
CFLAGS_cdnsp-trace.o := -I$(src)

cdns-usb-common-y := core.o drd.o
@@ -10,10 +10,10 @@ obj-$(CONFIG_USB_CDNS3) += cdns3.o
obj-$(CONFIG_USB_CDNS_SUPPORT) += cdns-usb-common.o

cdns-usb-common-$(CONFIG_USB_CDNS_HOST) += host.o
-cdns3-$(CONFIG_USB_CDNS3_GADGET) += gadget.o ep0.o
+cdns3-$(CONFIG_USB_CDNS3_GADGET) += cdns3-gadget.o cdns3-ep0.o

ifneq ($(CONFIG_USB_CDNS3_GADGET),)
-cdns3-$(CONFIG_TRACING) += trace.o
+cdns3-$(CONFIG_TRACING) += cdns3-trace.o
endif

obj-$(CONFIG_USB_CDNS3_PCI_WRAP) += cdns3-pci-wrap.o
diff --git a/drivers/usb/cdns3/debug.h b/drivers/usb/cdns3/cdns3-debug.h
similarity index 100%
rename from drivers/usb/cdns3/debug.h
rename to drivers/usb/cdns3/cdns3-debug.h
diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/cdns3-ep0.c
similarity index 99%
rename from drivers/usb/cdns3/ep0.c
rename to drivers/usb/cdns3/cdns3-ep0.c
index d3121a32cc68..b0390fe9a396 100644
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/cdns3-ep0.c
@@ -13,8 +13,8 @@
#include <linux/usb/composite.h>
#include <linux/iopoll.h>

-#include "gadget.h"
-#include "trace.h"
+#include "cdns3-gadget.h"
+#include "cdns3-trace.h"

static struct usb_endpoint_descriptor cdns3_gadget_ep0_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
similarity index 99%
rename from drivers/usb/cdns3/gadget.c
rename to drivers/usb/cdns3/cdns3-gadget.c
index 9e0a82063873..d507a23c7047 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/cdns3-gadget.c
@@ -63,8 +63,8 @@

#include "core.h"
#include "gadget-export.h"
-#include "gadget.h"
-#include "trace.h"
+#include "cdns3-gadget.h"
+#include "cdns3-trace.h"
#include "drd.h"

static int __cdns3_gadget_ep_queue(struct usb_ep *ep,
diff --git a/drivers/usb/cdns3/gadget.h b/drivers/usb/cdns3/cdns3-gadget.h
similarity index 100%
rename from drivers/usb/cdns3/gadget.h
rename to drivers/usb/cdns3/cdns3-gadget.h
diff --git a/drivers/usb/cdns3/trace.c b/drivers/usb/cdns3/cdns3-trace.c
similarity index 89%
rename from drivers/usb/cdns3/trace.c
rename to drivers/usb/cdns3/cdns3-trace.c
index 459fa72d9c74..b9858acaef02 100644
--- a/drivers/usb/cdns3/trace.c
+++ b/drivers/usb/cdns3/cdns3-trace.c
@@ -8,4 +8,4 @@
*/

#define CREATE_TRACE_POINTS
-#include "trace.h"
+#include "cdns3-trace.h"
diff --git a/drivers/usb/cdns3/trace.h b/drivers/usb/cdns3/cdns3-trace.h
similarity index 99%
rename from drivers/usb/cdns3/trace.h
rename to drivers/usb/cdns3/cdns3-trace.h
index 0a2a3269bfac..8648c7a7a9dd 100644
--- a/drivers/usb/cdns3/trace.h
+++ b/drivers/usb/cdns3/cdns3-trace.h
@@ -19,8 +19,8 @@
#include <asm/byteorder.h>
#include <linux/usb/ch9.h>
#include "core.h"
-#include "gadget.h"
-#include "debug.h"
+#include "cdns3-gadget.h"
+#include "cdns3-debug.h"

#define CDNS3_MSG_MAX 500

@@ -565,6 +565,6 @@ DEFINE_EVENT(cdns3_log_request_handled, cdns3_request_handled,
#define TRACE_INCLUDE_PATH .

#undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE trace
+#define TRACE_INCLUDE_FILE cdns3-trace

#include <trace/define_trace.h>
--
2.17.1

2020-11-11 03:31:57

by Peter Chen

Subject: Re: [PATCH v2 09/10] usb: cdns3: Change file names for cdns3 driver.

On 20-11-06 12:42:59, Pawel Laszczak wrote:
> Patch adds prefix cdns3- to all file names related only to
> cdsn3 driver.

%s/cdsn3/cdns3

Peter

>
> Signed-off-by: Pawel Laszczak <[email protected]>
> ---
> drivers/usb/cdns3/Makefile | 6 +++---
> drivers/usb/cdns3/{debug.h => cdns3-debug.h} | 0
> drivers/usb/cdns3/{ep0.c => cdns3-ep0.c} | 4 ++--
> drivers/usb/cdns3/{gadget.c => cdns3-gadget.c} | 4 ++--
> drivers/usb/cdns3/{gadget.h => cdns3-gadget.h} | 0
> drivers/usb/cdns3/{trace.c => cdns3-trace.c} | 2 +-
> drivers/usb/cdns3/{trace.h => cdns3-trace.h} | 6 +++---
> 7 files changed, 11 insertions(+), 11 deletions(-)
> rename drivers/usb/cdns3/{debug.h => cdns3-debug.h} (100%)
> rename drivers/usb/cdns3/{ep0.c => cdns3-ep0.c} (99%)
> rename drivers/usb/cdns3/{gadget.c => cdns3-gadget.c} (99%)
> rename drivers/usb/cdns3/{gadget.h => cdns3-gadget.h} (100%)
> rename drivers/usb/cdns3/{trace.c => cdns3-trace.c} (89%)
> rename drivers/usb/cdns3/{trace.h => cdns3-trace.h} (99%)
>
> diff --git a/drivers/usb/cdns3/Makefile b/drivers/usb/cdns3/Makefile
> index a4fdaabdbe18..01a9a9620044 100644
> --- a/drivers/usb/cdns3/Makefile
> +++ b/drivers/usb/cdns3/Makefile
> @@ -1,6 +1,6 @@
> # SPDX-License-Identifier: GPL-2.0
> # define_trace.h needs to know how to find our header
> -CFLAGS_trace.o := -I$(src)
> +CFLAGS_cdns3-trace.o := -I$(src)
> CFLAGS_cdnsp-trace.o := -I$(src)
>
> cdns-usb-common-y := core.o drd.o
> @@ -10,10 +10,10 @@ obj-$(CONFIG_USB_CDNS3) += cdns3.o
> obj-$(CONFIG_USB_CDNS_SUPPORT) += cdns-usb-common.o
>
> cdns-usb-common-$(CONFIG_USB_CDNS_HOST) += host.o
> -cdns3-$(CONFIG_USB_CDNS3_GADGET) += gadget.o ep0.o
> +cdns3-$(CONFIG_USB_CDNS3_GADGET) += cdns3-gadget.o cdns3-ep0.o
>
> ifneq ($(CONFIG_USB_CDNS3_GADGET),)
> -cdns3-$(CONFIG_TRACING) += trace.o
> +cdns3-$(CONFIG_TRACING) += cdns3-trace.o
> endif
>
> obj-$(CONFIG_USB_CDNS3_PCI_WRAP) += cdns3-pci-wrap.o
> diff --git a/drivers/usb/cdns3/debug.h b/drivers/usb/cdns3/cdns3-debug.h
> similarity index 100%
> rename from drivers/usb/cdns3/debug.h
> rename to drivers/usb/cdns3/cdns3-debug.h
> diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/cdns3-ep0.c
> similarity index 99%
> rename from drivers/usb/cdns3/ep0.c
> rename to drivers/usb/cdns3/cdns3-ep0.c
> index d3121a32cc68..b0390fe9a396 100644
> --- a/drivers/usb/cdns3/ep0.c
> +++ b/drivers/usb/cdns3/cdns3-ep0.c
> @@ -13,8 +13,8 @@
> #include <linux/usb/composite.h>
> #include <linux/iopoll.h>
>
> -#include "gadget.h"
> -#include "trace.h"
> +#include "cdns3-gadget.h"
> +#include "cdns3-trace.h"
>
> static struct usb_endpoint_descriptor cdns3_gadget_ep0_desc = {
> .bLength = USB_DT_ENDPOINT_SIZE,
> diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
> similarity index 99%
> rename from drivers/usb/cdns3/gadget.c
> rename to drivers/usb/cdns3/cdns3-gadget.c
> index 9e0a82063873..d507a23c7047 100644
> --- a/drivers/usb/cdns3/gadget.c
> +++ b/drivers/usb/cdns3/cdns3-gadget.c
> @@ -63,8 +63,8 @@
>
> #include "core.h"
> #include "gadget-export.h"
> -#include "gadget.h"
> -#include "trace.h"
> +#include "cdns3-gadget.h"
> +#include "cdns3-trace.h"
> #include "drd.h"
>
> static int __cdns3_gadget_ep_queue(struct usb_ep *ep,
> diff --git a/drivers/usb/cdns3/gadget.h b/drivers/usb/cdns3/cdns3-gadget.h
> similarity index 100%
> rename from drivers/usb/cdns3/gadget.h
> rename to drivers/usb/cdns3/cdns3-gadget.h
> diff --git a/drivers/usb/cdns3/trace.c b/drivers/usb/cdns3/cdns3-trace.c
> similarity index 89%
> rename from drivers/usb/cdns3/trace.c
> rename to drivers/usb/cdns3/cdns3-trace.c
> index 459fa72d9c74..b9858acaef02 100644
> --- a/drivers/usb/cdns3/trace.c
> +++ b/drivers/usb/cdns3/cdns3-trace.c
> @@ -8,4 +8,4 @@
> */
>
> #define CREATE_TRACE_POINTS
> -#include "trace.h"
> +#include "cdns3-trace.h"
> diff --git a/drivers/usb/cdns3/trace.h b/drivers/usb/cdns3/cdns3-trace.h
> similarity index 99%
> rename from drivers/usb/cdns3/trace.h
> rename to drivers/usb/cdns3/cdns3-trace.h
> index 0a2a3269bfac..8648c7a7a9dd 100644
> --- a/drivers/usb/cdns3/trace.h
> +++ b/drivers/usb/cdns3/cdns3-trace.h
> @@ -19,8 +19,8 @@
> #include <asm/byteorder.h>
> #include <linux/usb/ch9.h>
> #include "core.h"
> -#include "gadget.h"
> -#include "debug.h"
> +#include "cdns3-gadget.h"
> +#include "cdns3-debug.h"
>
> #define CDNS3_MSG_MAX 500
>
> @@ -565,6 +565,6 @@ DEFINE_EVENT(cdns3_log_request_handled, cdns3_request_handled,
> #define TRACE_INCLUDE_PATH .
>
> #undef TRACE_INCLUDE_FILE
> -#define TRACE_INCLUDE_FILE trace
> +#define TRACE_INCLUDE_FILE cdns3-trace
>
> #include <trace/define_trace.h>
> --
> 2.17.1
>

--

Thanks,
Peter Chen