* [PATCH 01/11] dwc3: meson: fix coccinelle WARNING
@ 2020-08-13 6:25 balbi
2020-08-13 6:25 ` [PATCH 02/11] dwc3: debug: fix sparse warning balbi
` (9 more replies)
0 siblings, 10 replies; 15+ messages in thread
From: balbi @ 2020-08-13 6:25 UTC (permalink / raw)
To: Linux USB; +Cc: Felipe Balbi
From: Felipe Balbi <balbi@kernel.org>
Coccinelle suggests using PTR_ERR_OR_ZERO().
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/dwc3/dwc3-meson-g12a.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
index 88b75b5a039c..9c50a8f2929e 100644
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
@@ -626,10 +626,7 @@ static int dwc3_meson_gxl_setup_regmaps(struct dwc3_meson_g12a *priv,
/* GXL controls the PHY mode in the PHY registers unlike G12A */
priv->usb_glue_regmap = devm_regmap_init_mmio(priv->dev, base,
&phy_meson_g12a_usb_glue_regmap_conf);
- if (IS_ERR(priv->usb_glue_regmap))
- return PTR_ERR(priv->usb_glue_regmap);
-
- return 0;
+ return PTR_ERR_OR_ZERO(priv->usb_glue_regmap);
}
static int dwc3_meson_g12a_setup_regmaps(struct dwc3_meson_g12a *priv,
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 02/11] dwc3: debug: fix sparse warning
2020-08-13 6:25 [PATCH 01/11] dwc3: meson: fix coccinelle WARNING balbi
@ 2020-08-13 6:25 ` balbi
2020-08-13 6:25 ` [PATCH 03/11] dwc3: meson: fix checkpatch errors and warnings balbi
` (8 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: balbi @ 2020-08-13 6:25 UTC (permalink / raw)
To: Linux USB; +Cc: Felipe Balbi
From: Felipe Balbi <balbi@kernel.org>
Fix the following sparse warning:
drivers/usb/dwc3/trace.c: note: in included file (through drivers/usb/dwc3/trace.h):
drivers/usb/dwc3/debug.h:374:39: warning: cast to non-scalar
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/dwc3/debug.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/debug.h b/drivers/usb/dwc3/debug.h
index 3d16dac4e5cc..8e03bcb77da8 100644
--- a/drivers/usb/dwc3/debug.h
+++ b/drivers/usb/dwc3/debug.h
@@ -371,7 +371,9 @@ static inline const char *dwc3_gadget_event_type_string(u8 event)
static inline const char *dwc3_decode_event(char *str, size_t size, u32 event,
u32 ep0state)
{
- const union dwc3_event evt = (union dwc3_event) event;
+ union dwc3_event evt;
+
+ memcpy(&evt, &event, sizeof(event));
if (evt.type.is_devspec)
return dwc3_gadget_event_string(str, size, &evt.devt);
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 03/11] dwc3: meson: fix checkpatch errors and warnings
2020-08-13 6:25 [PATCH 01/11] dwc3: meson: fix coccinelle WARNING balbi
2020-08-13 6:25 ` [PATCH 02/11] dwc3: debug: fix sparse warning balbi
@ 2020-08-13 6:25 ` balbi
2020-08-13 6:25 ` [PATCH 04/11] dwc3: ulpi: fix checkpatch warning balbi
` (7 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: balbi @ 2020-08-13 6:25 UTC (permalink / raw)
To: Linux USB; +Cc: Felipe Balbi
From: Felipe Balbi <balbi@kernel.org>
no functional changes.
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/dwc3/dwc3-meson-g12a.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
index 9c50a8f2929e..6522187a40cf 100644
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
@@ -116,11 +116,11 @@ static struct clk_bulk_data meson_a1_clocks[] = {
{ .id = "xtal_usb_ctrl" },
};
-static const char *meson_gxm_phy_names[] = {
+static const char * const meson_gxm_phy_names[] = {
"usb2-phy0", "usb2-phy1", "usb2-phy2",
};
-static const char *meson_g12a_phy_names[] = {
+static const char * const meson_g12a_phy_names[] = {
"usb2-phy0", "usb2-phy1", "usb3-phy0",
};
@@ -132,7 +132,7 @@ static const char *meson_g12a_phy_names[] = {
* correctly when only the "usb2-phy1" phy is specified on-par with the
* DT bindings.
*/
-static const char *meson_a1_phy_names[] = {
+static const char * const meson_a1_phy_names[] = {
"usb2-phy0", "usb2-phy1"
};
@@ -143,7 +143,7 @@ struct dwc3_meson_g12a_drvdata {
bool otg_phy_host_port_disable;
struct clk_bulk_data *clks;
int num_clks;
- const char **phy_names;
+ const char * const *phy_names;
int num_phys;
int (*setup_regmaps)(struct dwc3_meson_g12a *priv, void __iomem *base);
int (*usb2_init_phy)(struct dwc3_meson_g12a *priv, int i,
@@ -520,11 +520,7 @@ static int dwc3_meson_g12a_role_set(struct usb_role_switch *sw,
return 0;
if (priv->drvdata->otg_phy_host_port_disable)
- dev_warn_once(priv->dev, "Manual OTG switch is broken on this "\
- "SoC, when manual switching from "\
- "Host to device, DWC3 controller "\
- "will need to be resetted in order "\
- "to recover usage of the Host port");
+ dev_warn_once(priv->dev, "Broken manual OTG switch\n");
return dwc3_meson_g12a_otg_mode_set(priv, mode);
}
@@ -906,8 +902,8 @@ static int __maybe_unused dwc3_meson_g12a_resume(struct device *dev)
return ret;
}
- if (priv->vbus && priv->otg_phy_mode == PHY_MODE_USB_HOST) {
- ret = regulator_enable(priv->vbus);
+ if (priv->vbus && priv->otg_phy_mode == PHY_MODE_USB_HOST) {
+ ret = regulator_enable(priv->vbus);
if (ret)
return ret;
}
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 04/11] dwc3: ulpi: fix checkpatch warning
2020-08-13 6:25 [PATCH 01/11] dwc3: meson: fix coccinelle WARNING balbi
2020-08-13 6:25 ` [PATCH 02/11] dwc3: debug: fix sparse warning balbi
2020-08-13 6:25 ` [PATCH 03/11] dwc3: meson: fix checkpatch errors and warnings balbi
@ 2020-08-13 6:25 ` balbi
2020-08-13 6:25 ` [PATCH 05/11] dwc3: trace: fix checkpatch warnings balbi
` (6 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: balbi @ 2020-08-13 6:25 UTC (permalink / raw)
To: Linux USB; +Cc: Felipe Balbi
From: Felipe Balbi <balbi@kernel.org>
no functional changes.
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/dwc3/ulpi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/ulpi.c b/drivers/usb/dwc3/ulpi.c
index e6e6176386a4..aa213c9815f6 100644
--- a/drivers/usb/dwc3/ulpi.c
+++ b/drivers/usb/dwc3/ulpi.c
@@ -19,7 +19,7 @@
static int dwc3_ulpi_busyloop(struct dwc3 *dwc)
{
- unsigned count = 1000;
+ unsigned int count = 1000;
u32 reg;
while (count--) {
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 05/11] dwc3: trace: fix checkpatch warnings
2020-08-13 6:25 [PATCH 01/11] dwc3: meson: fix coccinelle WARNING balbi
` (2 preceding siblings ...)
2020-08-13 6:25 ` [PATCH 04/11] dwc3: ulpi: fix checkpatch warning balbi
@ 2020-08-13 6:25 ` balbi
2020-08-13 6:25 ` [PATCH 06/11] dwc3: debug: fix checkpatch warning balbi
` (5 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: balbi @ 2020-08-13 6:25 UTC (permalink / raw)
To: Linux USB; +Cc: Felipe Balbi
From: Felipe Balbi <balbi@kernel.org>
no functional changes
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/dwc3/trace.h | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/dwc3/trace.h b/drivers/usb/dwc3/trace.h
index da1be01637c8..97f4f1125a41 100644
--- a/drivers/usb/dwc3/trace.h
+++ b/drivers/usb/dwc3/trace.h
@@ -104,8 +104,8 @@ DECLARE_EVENT_CLASS(dwc3_log_request,
TP_STRUCT__entry(
__string(name, req->dep->name)
__field(struct dwc3_request *, req)
- __field(unsigned, actual)
- __field(unsigned, length)
+ __field(unsigned int, actual)
+ __field(unsigned int, length)
__field(int, status)
__field(int, zero)
__field(int, short_not_ok)
@@ -246,6 +246,7 @@ DECLARE_EVENT_CLASS(dwc3_log_trb,
__entry->dequeue, __entry->bph, __entry->bpl,
({char *s;
int pcm = ((__entry->size >> 24) & 3) + 1;
+
switch (__entry->type) {
case USB_ENDPOINT_XFER_INT:
case USB_ENDPOINT_XFER_ISOC:
@@ -291,12 +292,12 @@ DECLARE_EVENT_CLASS(dwc3_log_ep,
TP_ARGS(dep),
TP_STRUCT__entry(
__string(name, dep->name)
- __field(unsigned, maxpacket)
- __field(unsigned, maxpacket_limit)
- __field(unsigned, max_streams)
- __field(unsigned, maxburst)
- __field(unsigned, flags)
- __field(unsigned, direction)
+ __field(unsigned int, maxpacket)
+ __field(unsigned int, maxpacket_limit)
+ __field(unsigned int, max_streams)
+ __field(unsigned int, maxburst)
+ __field(unsigned int, flags)
+ __field(unsigned int, direction)
__field(u8, trb_enqueue)
__field(u8, trb_dequeue)
),
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 06/11] dwc3: debug: fix checkpatch warning
2020-08-13 6:25 [PATCH 01/11] dwc3: meson: fix coccinelle WARNING balbi
` (3 preceding siblings ...)
2020-08-13 6:25 ` [PATCH 05/11] dwc3: trace: fix checkpatch warnings balbi
@ 2020-08-13 6:25 ` balbi
2020-08-13 6:25 ` [PATCH 07/11] dwc3: core: fix checkpatch warnings balbi
` (4 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: balbi @ 2020-08-13 6:25 UTC (permalink / raw)
To: Linux USB; +Cc: Felipe Balbi
From: Felipe Balbi <balbi@kernel.org>
no functional changes
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/dwc3/debug.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/dwc3/debug.h b/drivers/usb/dwc3/debug.h
index 8e03bcb77da8..8ab394942360 100644
--- a/drivers/usb/dwc3/debug.h
+++ b/drivers/usb/dwc3/debug.h
@@ -413,8 +413,8 @@ static inline const char *dwc3_gadget_generic_cmd_status_string(int status)
#ifdef CONFIG_DEBUG_FS
-extern void dwc3_debugfs_init(struct dwc3 *);
-extern void dwc3_debugfs_exit(struct dwc3 *);
+extern void dwc3_debugfs_init(struct dwc3 *d);
+extern void dwc3_debugfs_exit(struct dwc3 *d);
#else
static inline void dwc3_debugfs_init(struct dwc3 *d)
{ }
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 07/11] dwc3: core: fix checkpatch warnings
2020-08-13 6:25 [PATCH 01/11] dwc3: meson: fix coccinelle WARNING balbi
` (4 preceding siblings ...)
2020-08-13 6:25 ` [PATCH 06/11] dwc3: debug: fix checkpatch warning balbi
@ 2020-08-13 6:25 ` balbi
2020-08-13 6:25 ` [PATCH 08/11] dwc3: gadget: " balbi
` (3 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: balbi @ 2020-08-13 6:25 UTC (permalink / raw)
To: Linux USB; +Cc: Felipe Balbi
From: Felipe Balbi <balbi@kernel.org>
no functional changes
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/dwc3/core.h | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 2f04b3e42bf1..ce457950606e 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -634,7 +634,7 @@ struct dwc3_trb;
struct dwc3_event_buffer {
void *buf;
void *cache;
- unsigned length;
+ unsigned int length;
unsigned int lpos;
unsigned int count;
unsigned int flags;
@@ -694,7 +694,7 @@ struct dwc3_ep {
struct dwc3 *dwc;
u32 saved_state;
- unsigned flags;
+ unsigned int flags;
#define DWC3_EP_ENABLED BIT(0)
#define DWC3_EP_STALL BIT(1)
#define DWC3_EP_WEDGE BIT(2)
@@ -893,9 +893,9 @@ struct dwc3_request {
struct scatterlist *sg;
struct scatterlist *start_sg;
- unsigned num_pending_sgs;
+ unsigned int num_pending_sgs;
unsigned int num_queued_sgs;
- unsigned remaining;
+ unsigned int remaining;
unsigned int status;
#define DWC3_REQUEST_STATUS_QUEUED 0
@@ -908,11 +908,11 @@ struct dwc3_request {
struct dwc3_trb *trb;
dma_addr_t trb_dma;
- unsigned num_trbs;
+ unsigned int num_trbs;
- unsigned needs_extra_trb:1;
- unsigned direction:1;
- unsigned mapped:1;
+ unsigned int needs_extra_trb:1;
+ unsigned int direction:1;
+ unsigned int mapped:1;
};
/*
@@ -1010,8 +1010,8 @@ struct dwc3_scratchpad_array {
* @has_lpm_erratum: true when core was configured with LPM Erratum. Note that
* there's now way for software to detect this in runtime.
* @is_utmi_l1_suspend: the core asserts output signal
- * 0 - utmi_sleep_n
- * 1 - utmi_l1_suspend_n
+ * 0 - utmi_sleep_n
+ * 1 - utmi_l1_suspend_n
* @is_fpga: true when we are using the FPGA board
* @pending_events: true when we have pending IRQs to be handled
* @pullups_connected: true when Run/Stop bit is set
@@ -1047,13 +1047,13 @@ struct dwc3_scratchpad_array {
* instances in park mode.
* @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk
* @tx_de_emphasis: Tx de-emphasis value
- * 0 - -6dB de-emphasis
- * 1 - -3.5dB de-emphasis
- * 2 - No de-emphasis
- * 3 - Reserved
+ * 0 - -6dB de-emphasis
+ * 1 - -3.5dB de-emphasis
+ * 2 - No de-emphasis
+ * 3 - Reserved
* @dis_metastability_quirk: set to disable metastability quirk.
* @imod_interval: set the interrupt moderation interval in 250ns
- * increments or 0 to disable.
+ * increments or 0 to disable.
*/
struct dwc3 {
struct work_struct drd_work;
@@ -1456,9 +1456,10 @@ void dwc3_gadget_exit(struct dwc3 *dwc);
int dwc3_gadget_set_test_mode(struct dwc3 *dwc, int mode);
int dwc3_gadget_get_link_state(struct dwc3 *dwc);
int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum dwc3_link_state state);
-int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,
+int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd,
struct dwc3_gadget_ep_cmd_params *params);
-int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned cmd, u32 param);
+int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned int cmd,
+ u32 param);
#else
static inline int dwc3_gadget_init(struct dwc3 *dwc)
{ return 0; }
@@ -1472,7 +1473,7 @@ static inline int dwc3_gadget_set_link_state(struct dwc3 *dwc,
enum dwc3_link_state state)
{ return 0; }
-static inline int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,
+static inline int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd,
struct dwc3_gadget_ep_cmd_params *params)
{ return 0; }
static inline int dwc3_send_gadget_generic_command(struct dwc3 *dwc,
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 08/11] dwc3: gadget: fix checkpatch warnings
2020-08-13 6:25 [PATCH 01/11] dwc3: meson: fix coccinelle WARNING balbi
` (5 preceding siblings ...)
2020-08-13 6:25 ` [PATCH 07/11] dwc3: core: fix checkpatch warnings balbi
@ 2020-08-13 6:25 ` balbi
2020-08-13 6:25 ` [PATCH 09/11] dwc3: ep0: " balbi
` (2 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: balbi @ 2020-08-13 6:25 UTC (permalink / raw)
To: Linux USB; +Cc: Felipe Balbi
From: Felipe Balbi <balbi@kernel.org>
no functional changes
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/dwc3/gadget.c | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index e44bfc3b5096..6b9f891b7e40 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -227,7 +227,8 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
* Caller should take care of locking. Issue @cmd with a given @param to @dwc
* and wait for its completion.
*/
-int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned cmd, u32 param)
+int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned int cmd,
+ u32 param)
{
u32 timeout = 500;
int status = 0;
@@ -268,7 +269,7 @@ static int __dwc3_gadget_wakeup(struct dwc3 *dwc);
* Caller should handle locking. This function will issue @cmd with given
* @params to @dep and wait for its completion.
*/
-int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,
+int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd,
struct dwc3_gadget_ep_cmd_params *params)
{
const struct usb_endpoint_descriptor *desc = dep->endpoint.desc;
@@ -564,6 +565,7 @@ static int dwc3_gadget_set_ep_config(struct dwc3_ep *dep, unsigned int action)
/* Burst size is only needed in SuperSpeed mode */
if (dwc->gadget.speed >= USB_SPEED_SUPER) {
u32 burst = dep->endpoint.maxburst;
+
params.param0 |= DWC3_DEPCFG_BURST_SIZE(burst - 1);
}
@@ -942,9 +944,10 @@ static u32 dwc3_calc_trbs_left(struct dwc3_ep *dep)
}
static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb,
- dma_addr_t dma, unsigned length, unsigned chain, unsigned node,
- unsigned stream_id, unsigned short_not_ok,
- unsigned no_interrupt, unsigned is_last)
+ dma_addr_t dma, unsigned int length, unsigned int chain,
+ unsigned int node, unsigned int stream_id,
+ unsigned int short_not_ok, unsigned int no_interrupt,
+ unsigned int is_last)
{
struct dwc3 *dwc = dep->dwc;
struct usb_gadget *gadget = &dwc->gadget;
@@ -1058,15 +1061,15 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb,
* @node: only for isochronous endpoints. First TRB needs different type.
*/
static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
- struct dwc3_request *req, unsigned chain, unsigned node)
+ struct dwc3_request *req, unsigned int chain, unsigned int node)
{
struct dwc3_trb *trb;
+ unsigned int stream_id = req->request.stream_id;
+ unsigned int short_not_ok = req->request.short_not_ok;
+ unsigned int no_interrupt = req->request.no_interrupt;
+ unsigned int is_last = req->request.is_last;
unsigned int length;
dma_addr_t dma;
- unsigned stream_id = req->request.stream_id;
- unsigned short_not_ok = req->request.short_not_ok;
- unsigned no_interrupt = req->request.no_interrupt;
- unsigned is_last = req->request.is_last;
if (req->request.num_sgs > 0) {
length = sg_dma_len(req->start_sg);
@@ -1104,7 +1107,7 @@ static void dwc3_prepare_one_trb_sg(struct dwc3_ep *dep,
unsigned int length = req->request.length;
unsigned int maxp = usb_endpoint_maxp(dep->endpoint.desc);
unsigned int rem = length % maxp;
- unsigned chain = true;
+ unsigned int chain = true;
/*
* IOMMU driver is coalescing the list of sgs which shares a
@@ -1586,9 +1589,8 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
return 0;
if ((dep->flags & DWC3_EP_PENDING_REQUEST)) {
- if (!(dep->flags & DWC3_EP_TRANSFER_STARTED)) {
+ if (!(dep->flags & DWC3_EP_TRANSFER_STARTED))
return __dwc3_gadget_start_isoc(dep);
- }
}
}
@@ -1726,8 +1728,8 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol)
if (value) {
struct dwc3_trb *trb;
- unsigned transfer_in_flight;
- unsigned started;
+ unsigned int transfer_in_flight;
+ unsigned int started;
if (dep->number > 1)
trb = dwc3_ep_prev_trb(dep, dep->trb_enqueue);
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 09/11] dwc3: ep0: fix checkpatch warnings
2020-08-13 6:25 [PATCH 01/11] dwc3: meson: fix coccinelle WARNING balbi
` (6 preceding siblings ...)
2020-08-13 6:25 ` [PATCH 08/11] dwc3: gadget: " balbi
@ 2020-08-13 6:25 ` balbi
2020-08-13 6:25 ` [PATCH 10/11] dwc3: qcom: " balbi
2020-08-13 6:25 ` [PATCH 11/11] dwc3: debugfs: " balbi
9 siblings, 0 replies; 15+ messages in thread
From: balbi @ 2020-08-13 6:25 UTC (permalink / raw)
To: Linux USB; +Cc: Felipe Balbi
From: Felipe Balbi <balbi@kernel.org>
no functional changes
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/dwc3/ep0.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 59f2e8c31bd1..5bb4327ae237 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -105,7 +105,7 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
* IRQ we were waiting for is long gone.
*/
if (dep->flags & DWC3_EP_PENDING_REQUEST) {
- unsigned direction;
+ unsigned int direction;
direction = !!(dep->flags & DWC3_EP0_DIR_IN);
@@ -127,7 +127,7 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
* handle it here.
*/
if (dwc->delayed_status) {
- unsigned direction;
+ unsigned int direction;
direction = !dwc->ep0_expect_in;
dwc->delayed_status = false;
@@ -172,7 +172,7 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
* XferNotReady(STATUS).
*/
if (dwc->three_stage_setup) {
- unsigned direction;
+ unsigned int direction;
direction = dwc->ep0_expect_in;
dwc->ep0state = EP0_DATA_PHASE;
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 10/11] dwc3: qcom: fix checkpatch warnings
2020-08-13 6:25 [PATCH 01/11] dwc3: meson: fix coccinelle WARNING balbi
` (7 preceding siblings ...)
2020-08-13 6:25 ` [PATCH 09/11] dwc3: ep0: " balbi
@ 2020-08-13 6:25 ` balbi
2020-08-13 6:25 ` [PATCH 11/11] dwc3: debugfs: " balbi
9 siblings, 0 replies; 15+ messages in thread
From: balbi @ 2020-08-13 6:25 UTC (permalink / raw)
To: Linux USB; +Cc: Felipe Balbi
From: Felipe Balbi <balbi@kernel.org>
no functional changes
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/dwc3/dwc3-qcom.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index fcf7f79fb983..c703d552bbcf 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -444,7 +444,9 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
{
struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata;
- int irq, ret;
+ int irq;
+ int ret;
+
irq = dwc3_qcom_get_irq(pdev, "hs_phy_irq",
pdata ? pdata->hs_phy_irq_index : -1);
if (irq > 0) {
@@ -563,7 +565,7 @@ static const struct property_entry dwc3_qcom_acpi_properties[] = {
static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
{
- struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
+ struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
struct device *dev = &pdev->dev;
struct resource *res, *child_res = NULL;
int irq;
@@ -623,7 +625,7 @@ static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
static int dwc3_qcom_of_register_core(struct platform_device *pdev)
{
- struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
+ struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
struct device_node *np = pdev->dev.of_node, *dwc3_np;
struct device *dev = &pdev->dev;
int ret;
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 11/11] dwc3: debugfs: fix checkpatch warnings
2020-08-13 6:25 [PATCH 01/11] dwc3: meson: fix coccinelle WARNING balbi
` (8 preceding siblings ...)
2020-08-13 6:25 ` [PATCH 10/11] dwc3: qcom: " balbi
@ 2020-08-13 6:25 ` balbi
2020-08-13 19:14 ` Thinh Nguyen
9 siblings, 1 reply; 15+ messages in thread
From: balbi @ 2020-08-13 6:25 UTC (permalink / raw)
To: Linux USB; +Cc: Felipe Balbi
From: Felipe Balbi <balbi@kernel.org>
no functional changes
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/dwc3/debugfs.c | 56 ++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 30 deletions(-)
diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c
index 2c7b6dd79cdf..608639a0dea7 100644
--- a/drivers/usb/dwc3/debugfs.c
+++ b/drivers/usb/dwc3/debugfs.c
@@ -397,13 +397,13 @@ static int dwc3_mode_show(struct seq_file *s, void *unused)
switch (DWC3_GCTL_PRTCAP(reg)) {
case DWC3_GCTL_PRTCAP_HOST:
- seq_printf(s, "host\n");
+ seq_puts(s, "host\n");
break;
case DWC3_GCTL_PRTCAP_DEVICE:
- seq_printf(s, "device\n");
+ seq_puts(s, "device\n");
break;
case DWC3_GCTL_PRTCAP_OTG:
- seq_printf(s, "otg\n");
+ seq_puts(s, "otg\n");
break;
default:
seq_printf(s, "UNKNOWN %08x\n", DWC3_GCTL_PRTCAP(reg));
@@ -464,22 +464,22 @@ static int dwc3_testmode_show(struct seq_file *s, void *unused)
switch (reg) {
case 0:
- seq_printf(s, "no test\n");
+ seq_puts(s, "no test\n");
break;
case USB_TEST_J:
- seq_printf(s, "test_j\n");
+ seq_puts(s, "test_j\n");
break;
case USB_TEST_K:
- seq_printf(s, "test_k\n");
+ seq_puts(s, "test_k\n");
break;
case USB_TEST_SE0_NAK:
- seq_printf(s, "test_se0_nak\n");
+ seq_puts(s, "test_se0_nak\n");
break;
case USB_TEST_PACKET:
- seq_printf(s, "test_packet\n");
+ seq_puts(s, "test_packet\n");
break;
case USB_TEST_FORCE_ENABLE:
- seq_printf(s, "test_force_enable\n");
+ seq_puts(s, "test_force_enable\n");
break;
default:
seq_printf(s, "UNKNOWN %d\n", reg);
@@ -760,27 +760,26 @@ static int dwc3_transfer_type_show(struct seq_file *s, void *unused)
unsigned long flags;
spin_lock_irqsave(&dwc->lock, flags);
- if (!(dep->flags & DWC3_EP_ENABLED) ||
- !dep->endpoint.desc) {
- seq_printf(s, "--\n");
+ if (!(dep->flags & DWC3_EP_ENABLED) || !dep->endpoint.desc) {
+ seq_puts(s, "--\n");
goto out;
}
switch (usb_endpoint_type(dep->endpoint.desc)) {
case USB_ENDPOINT_XFER_CONTROL:
- seq_printf(s, "control\n");
+ seq_puts(s, "control\n");
break;
case USB_ENDPOINT_XFER_ISOC:
- seq_printf(s, "isochronous\n");
+ seq_puts(s, "isochronous\n");
break;
case USB_ENDPOINT_XFER_BULK:
- seq_printf(s, "bulk\n");
+ seq_puts(s, "bulk\n");
break;
case USB_ENDPOINT_XFER_INT:
- seq_printf(s, "interrupt\n");
+ seq_puts(s, "interrupt\n");
break;
default:
- seq_printf(s, "--\n");
+ seq_puts(s, "--\n");
}
out:
@@ -798,11 +797,11 @@ static int dwc3_trb_ring_show(struct seq_file *s, void *unused)
spin_lock_irqsave(&dwc->lock, flags);
if (dep->number <= 1) {
- seq_printf(s, "--\n");
+ seq_puts(s, "--\n");
goto out;
}
- seq_printf(s, "buffer_addr,size,type,ioc,isp_imi,csp,chn,lst,hwo\n");
+ seq_puts(s, "buffer_addr,size,type,ioc,isp_imi,csp,chn,lst,hwo\n");
for (i = 0; i < DWC3_TRB_NUM; i++) {
struct dwc3_trb *trb = &dep->trb_pool[i];
@@ -884,7 +883,7 @@ static void dwc3_debugfs_create_endpoint_files(struct dwc3_ep *dep,
const struct file_operations *fops = dwc3_ep_file_map[i].fops;
const char *name = dwc3_ep_file_map[i].name;
- debugfs_create_file(name, S_IRUGO, parent, dep, fops);
+ debugfs_create_file(name, 0444, parent, dep, fops);
}
}
@@ -929,21 +928,18 @@ void dwc3_debugfs_init(struct dwc3 *dwc)
root = debugfs_create_dir(dev_name(dwc->dev), usb_debug_root);
dwc->root = root;
- debugfs_create_regset32("regdump", S_IRUGO, root, dwc->regset);
+ debugfs_create_regset32("regdump", 0444, root, dwc->regset);
+ debugfs_create_file("lsp_dump", 0644, root, dwc, &dwc3_lsp_fops);
- debugfs_create_file("lsp_dump", S_IRUGO | S_IWUSR, root, dwc,
- &dwc3_lsp_fops);
-
- if (IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)) {
- debugfs_create_file("mode", S_IRUGO | S_IWUSR, root, dwc,
+ if (IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE))
+ debugfs_create_file("mode", 0644, root, dwc,
&dwc3_mode_fops);
- }
if (IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) ||
IS_ENABLED(CONFIG_USB_DWC3_GADGET)) {
- debugfs_create_file("testmode", S_IRUGO | S_IWUSR, root, dwc,
- &dwc3_testmode_fops);
- debugfs_create_file("link_state", S_IRUGO | S_IWUSR, root, dwc,
+ debugfs_create_file("testmode", 0644, root, dwc,
+ &dwc3_testmode_fops);
+ debugfs_create_file("link_state", 0644, root, dwc,
&dwc3_link_state_fops);
dwc3_debugfs_create_endpoint_dirs(dwc, root);
}
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 11/11] dwc3: debugfs: fix checkpatch warnings
2020-08-13 6:25 ` [PATCH 11/11] dwc3: debugfs: " balbi
@ 2020-08-13 19:14 ` Thinh Nguyen
2020-08-14 5:12 ` Felipe Balbi
0 siblings, 1 reply; 15+ messages in thread
From: Thinh Nguyen @ 2020-08-13 19:14 UTC (permalink / raw)
To: balbi, Linux USB
Hi Felipe,
balbi@kernel.org wrote:
> From: Felipe Balbi <balbi@kernel.org>
>
> no functional changes
>
> Signed-off-by: Felipe Balbi <balbi@kernel.org>
> ---
> drivers/usb/dwc3/debugfs.c | 56 ++++++++++++++++++--------------------
> 1 file changed, 26 insertions(+), 30 deletions(-)
>
These checkpatch fixes will create many conflicts to the patches I
submitted.
Did you get a chance to take a look at them yet before I revise them to
be able to rebase on your testing/next branch?
Thanks,
Thinh
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 11/11] dwc3: debugfs: fix checkpatch warnings
2020-08-13 19:14 ` Thinh Nguyen
@ 2020-08-14 5:12 ` Felipe Balbi
2020-08-14 5:36 ` Thinh Nguyen
0 siblings, 1 reply; 15+ messages in thread
From: Felipe Balbi @ 2020-08-14 5:12 UTC (permalink / raw)
To: Thinh Nguyen, Linux USB
[-- Attachment #1: Type: text/plain, Size: 714 bytes --]
Thinh Nguyen <Thinh.Nguyen@synopsys.com> writes:
> Hi Felipe,
>
> balbi@kernel.org wrote:
>> From: Felipe Balbi <balbi@kernel.org>
>>
>> no functional changes
>>
>> Signed-off-by: Felipe Balbi <balbi@kernel.org>
>> ---
>> drivers/usb/dwc3/debugfs.c | 56 ++++++++++++++++++--------------------
>> 1 file changed, 26 insertions(+), 30 deletions(-)
>>
>
> These checkpatch fixes will create many conflicts to the patches I
> submitted.
>
> Did you get a chance to take a look at them yet before I revise them to
> be able to rebase on your testing/next branch?
Which patches specifically do you have in mind? I can rebase my patches
on top of yours, shouldn't be a big issue.
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 11/11] dwc3: debugfs: fix checkpatch warnings
2020-08-14 5:12 ` Felipe Balbi
@ 2020-08-14 5:36 ` Thinh Nguyen
2020-08-14 6:16 ` Thinh Nguyen
0 siblings, 1 reply; 15+ messages in thread
From: Thinh Nguyen @ 2020-08-14 5:36 UTC (permalink / raw)
To: Felipe Balbi, Thinh Nguyen, Linux USB
Felipe Balbi wrote:
> Thinh Nguyen <Thinh.Nguyen@synopsys.com> writes:
>
>> Hi Felipe,
>>
>> balbi@kernel.org wrote:
>>> From: Felipe Balbi <balbi@kernel.org>
>>>
>>> no functional changes
>>>
>>> Signed-off-by: Felipe Balbi <balbi@kernel.org>
>>> ---
>>> drivers/usb/dwc3/debugfs.c | 56 ++++++++++++++++++--------------------
>>> 1 file changed, 26 insertions(+), 30 deletions(-)
>>>
>> These checkpatch fixes will create many conflicts to the patches I
>> submitted.
>>
>> Did you get a chance to take a look at them yet before I revise them to
>> be able to rebase on your testing/next branch?
> Which patches specifically do you have in mind? I can rebase my patches
> on top of yours, shouldn't be a big issue.
>
If possible, can you rebase on top of these 2 series of fixes:
Series 1: [PATCH v2 0/7] usb: dwc3: gadget: Fix TRB preparation
https://lore.kernel.org/linux-usb/cover.1596767991.git.thinhn@synopsys.com/T/#t
Series 2: [PATCH 0/3] usb: dwc3: gadget: Fix halt/clear_stall handling
https://lore.kernel.org/linux-usb/cover.1596767991.git.thinhn@synopsys.com/T/#t
If they look ok to you, you can rebase on top of them. That'd help me a
bunch.
I'll let the series updating USB 3.2 soak for a little longer to for any
comment. I can rebase and resend that series later.
Thanks!
Thinh
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 11/11] dwc3: debugfs: fix checkpatch warnings
2020-08-14 5:36 ` Thinh Nguyen
@ 2020-08-14 6:16 ` Thinh Nguyen
0 siblings, 0 replies; 15+ messages in thread
From: Thinh Nguyen @ 2020-08-14 6:16 UTC (permalink / raw)
To: Felipe Balbi, Linux USB
Thinh Nguyen wrote:
> Felipe Balbi wrote:
>> Thinh Nguyen <Thinh.Nguyen@synopsys.com> writes:
>>
>>> Hi Felipe,
>>>
>>> balbi@kernel.org wrote:
>>>> From: Felipe Balbi <balbi@kernel.org>
>>>>
>>>> no functional changes
>>>>
>>>> Signed-off-by: Felipe Balbi <balbi@kernel.org>
>>>> ---
>>>> drivers/usb/dwc3/debugfs.c | 56 ++++++++++++++++++--------------------
>>>> 1 file changed, 26 insertions(+), 30 deletions(-)
>>>>
>>> These checkpatch fixes will create many conflicts to the patches I
>>> submitted.
>>>
>>> Did you get a chance to take a look at them yet before I revise them to
>>> be able to rebase on your testing/next branch?
>> Which patches specifically do you have in mind? I can rebase my patches
>> on top of yours, shouldn't be a big issue.
>>
> If possible, can you rebase on top of these 2 series of fixes:
>
> Series 1: [PATCH v2 0/7] usb: dwc3: gadget: Fix TRB preparation
> https://lore.kernel.org/linux-usb/cover.1596767991.git.thinhn@synopsys.com/T/#t
>
> Series 2: [PATCH 0/3] usb: dwc3: gadget: Fix halt/clear_stall handling
Correct link for series 2:
https://lore.kernel.org/linux-usb/cover.1596151437.git.thinhn@synopsys.com/T/#t
> If they look ok to you, you can rebase on top of them. That'd help me a
> bunch.
>
> I'll let the series updating USB 3.2 soak for a little longer to for any
> comment. I can rebase and resend that series later.
>
Thanks,
Thinh
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2020-08-14 6:16 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-13 6:25 [PATCH 01/11] dwc3: meson: fix coccinelle WARNING balbi
2020-08-13 6:25 ` [PATCH 02/11] dwc3: debug: fix sparse warning balbi
2020-08-13 6:25 ` [PATCH 03/11] dwc3: meson: fix checkpatch errors and warnings balbi
2020-08-13 6:25 ` [PATCH 04/11] dwc3: ulpi: fix checkpatch warning balbi
2020-08-13 6:25 ` [PATCH 05/11] dwc3: trace: fix checkpatch warnings balbi
2020-08-13 6:25 ` [PATCH 06/11] dwc3: debug: fix checkpatch warning balbi
2020-08-13 6:25 ` [PATCH 07/11] dwc3: core: fix checkpatch warnings balbi
2020-08-13 6:25 ` [PATCH 08/11] dwc3: gadget: " balbi
2020-08-13 6:25 ` [PATCH 09/11] dwc3: ep0: " balbi
2020-08-13 6:25 ` [PATCH 10/11] dwc3: qcom: " balbi
2020-08-13 6:25 ` [PATCH 11/11] dwc3: debugfs: " balbi
2020-08-13 19:14 ` Thinh Nguyen
2020-08-14 5:12 ` Felipe Balbi
2020-08-14 5:36 ` Thinh Nguyen
2020-08-14 6:16 ` Thinh Nguyen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.