Skip to contentSkip to conversation

usb: host: ehci.h: cleanup header file

PATCH In review Geyslan G. Bem 4 participants 15 messages Dec 9, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 usb: host: ehci.h: cleanup header file

This patch silences
- A coccinelle warning 'scripts/coccinelle/misc/compare_const_fl.cocci'
- All the errors and many warnings shown by checkpatch

---
 drivers/usb/host/ehci.h | 89 +++++++++++++++++++++++++------------------------
 1 file changed, 45 insertions(+), 44 deletions(-)
drivers/usb/host/ehci.h +45 -44
index ec61aed..a4f5ab5 100644
@@ -185,10 +185,10 @@ struct ehci_hcd {			/* one per controller */
 	struct ehci_sitd	*last_sitd_to_free;
 
 	/* per root hub port */
-	unsigned long		reset_done [EHCI_MAX_ROOT_PORTS];
+	unsigned long		reset_done[EHCI_MAX_ROOT_PORTS];
 
 	/* bit vectors (one bit per port) */
-	unsigned long		bus_suspended;		/* which ports were
+	unsigned long		bus_suspended;	/* which ports were
 			already suspended at the start of a bus suspend */
 	unsigned long		companion_ports;	/* which ports are
 			dedicated to the companion controller */
@@ -244,9 +244,9 @@ struct ehci_hcd {			/* one per controller */
 	/* irq statistics */
 #ifdef EHCI_STATS
 	struct ehci_stats	stats;
-#	define COUNT(x) do { (x)++; } while (0)
+#	define COUNT(x) ((x)++)
 #else
-#	define COUNT(x) do {} while (0)
+#	define COUNT(x) ((void) 0)
 #endif
 
 	/* debug files */
@@ -268,13 +268,13 @@ struct ehci_hcd {			/* one per controller */
 };
 
 /* convert between an HCD pointer and the corresponding EHCI_HCD */
-static inline struct ehci_hcd *hcd_to_ehci (struct usb_hcd *hcd)
+static inline struct ehci_hcd *hcd_to_ehci(struct usb_hcd *hcd)
 {
 	return (struct ehci_hcd *) (hcd->hcd_priv);
 }
-static inline struct usb_hcd *ehci_to_hcd (struct ehci_hcd *ehci)
+static inline struct usb_hcd *ehci_to_hcd(struct ehci_hcd *ehci)
 {
-	return container_of ((void *) ehci, struct usb_hcd, hcd_priv);
+	return container_of((void *) ehci, struct usb_hcd, hcd_priv);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -316,25 +316,25 @@ struct ehci_qtd {
 #define HALT_BIT(ehci)		cpu_to_hc32(ehci, QTD_STS_HALT)
 #define STATUS_BIT(ehci)	cpu_to_hc32(ehci, QTD_STS_STS)
 
-	__hc32			hw_buf [5];        /* see EHCI 3.5.4 */
-	__hc32			hw_buf_hi [5];        /* Appendix B */
+	__hc32			hw_buf[5];	/* see EHCI 3.5.4 */
+	__hc32			hw_buf_hi[5];	/* Appendix B */
 
 	/* the rest is HCD-private */
-	dma_addr_t		qtd_dma;		/* qtd address */
-	struct list_head	qtd_list;		/* sw qtd list */
-	struct urb		*urb;			/* qtd's urb */
-	size_t			length;			/* length of buffer */
-} __attribute__ ((aligned (32)));
+	dma_addr_t		qtd_dma;	/* qtd address */
+	struct list_head	qtd_list;	/* sw qtd list */
+	struct urb		*urb;		/* qtd's urb */
+	size_t			length;		/* length of buffer */
+} __aligned(32);
 
 /* mask NakCnt+T in qh->hw_alt_next */
-#define QTD_MASK(ehci)	cpu_to_hc32 (ehci, ~0x1f)
+#define QTD_MASK(ehci) (cpu_to_hc32(ehci, ~0x1f))
 
-#define IS_SHORT_READ(token) (QTD_LENGTH (token) != 0 && QTD_PID (token) == 1)
+#define IS_SHORT_READ(token) (QTD_LENGTH(token) != 0 && QTD_PID(token) == 1)
 
 /*-------------------------------------------------------------------------*/
 
 /* type tag from {qh,itd,sitd,fstn}->hw_next */
-#define Q_NEXT_TYPE(ehci,dma)	((dma) & cpu_to_hc32(ehci, 3 << 1))
+#define Q_NEXT_TYPE(ehci, dma) ((dma) & cpu_to_hc32(ehci, 3 << 1))
 
 /*
  * Now the following defines are not converted using the
@@ -350,7 +350,8 @@ struct ehci_qtd {
 #define Q_TYPE_FSTN	(3 << 1)
 
 /* next async queue entry, or pointer to interrupt/periodic QH */
-#define QH_NEXT(ehci,dma)	(cpu_to_hc32(ehci, (((u32)dma)&~0x01f)|Q_TYPE_QH))
+#define QH_NEXT(ehci, dma) \
+	(cpu_to_hc32(ehci, (((u32) dma) & ~0x01f) | Q_TYPE_QH))
 
 /* for periodic/async schedules and qtd lists, mark end of list */
 #define EHCI_LIST_END(ehci)	cpu_to_hc32(ehci, 1) /* "null pointer" to hw */
@@ -405,9 +406,9 @@ struct ehci_qh_hw {
 	__hc32			hw_qtd_next;
 	__hc32			hw_alt_next;
 	__hc32			hw_token;
-	__hc32			hw_buf [5];
-	__hc32			hw_buf_hi [5];
-} __attribute__ ((aligned(32)));
+	__hc32			hw_buf[5];
+	__hc32			hw_buf_hi[5];
+} __aligned(32);
 
 struct ehci_qh {
 	struct ehci_qh_hw	*hw;		/* Must come first */
@@ -462,7 +463,7 @@ struct ehci_iso_sched {
 	struct list_head	td_list;
 	unsigned		span;
 	unsigned		first_packet;
-	struct ehci_iso_packet	packet [0];
+	struct ehci_iso_packet	packet[0];
 };
 
 /*
@@ -510,7 +511,7 @@ struct ehci_iso_stream {
 struct ehci_itd {
 	/* first part defined by EHCI spec */
 	__hc32			hw_next;           /* see EHCI 3.3.1 */
-	__hc32			hw_transaction [8]; /* see EHCI 3.3.2 */
+	__hc32			hw_transaction[8]; /* see EHCI 3.3.2 */
 #define EHCI_ISOC_ACTIVE        (1<<31)        /* activate transfer this slot */
 #define EHCI_ISOC_BUF_ERR       (1<<30)        /* Data buffer error */
 #define EHCI_ISOC_BABBLE        (1<<29)        /* babble detected */
@@ -520,8 +521,8 @@ struct ehci_itd {
 
 #define ITD_ACTIVE(ehci)	cpu_to_hc32(ehci, EHCI_ISOC_ACTIVE)
 
-	__hc32			hw_bufp [7];	/* see EHCI 3.3.3 */
-	__hc32			hw_bufp_hi [7];	/* Appendix B */
+	__hc32			hw_bufp[7];	/* see EHCI 3.3.3 */
+	__hc32			hw_bufp_hi[7];	/* Appendix B */
 
 	/* the rest is HCD-private */
 	dma_addr_t		itd_dma;	/* for this itd */
@@ -535,7 +536,7 @@ struct ehci_itd {
 	unsigned		frame;		/* where scheduled */
 	unsigned		pg;
 	unsigned		index[8];	/* in urb->iso_frame_desc */
-} __attribute__ ((aligned (32)));
+} __aligned(32);
 
 /*-------------------------------------------------------------------------*/
 
@@ -554,7 +555,7 @@ struct ehci_sitd {
 	__hc32			hw_results;		/* EHCI table 3-11 */
 #define	SITD_IOC	(1 << 31)	/* interrupt on completion */
 #define	SITD_PAGE	(1 << 30)	/* buffer 0/1 */
-#define	SITD_LENGTH(x)	(0x3ff & ((x)>>16))
+#define	SITD_LENGTH(x)	(((x) >> 16) & 0x3ff)
 #define	SITD_STS_ACTIVE	(1 << 7)	/* HC may execute this */
 #define	SITD_STS_ERR	(1 << 6)	/* error from TT */
 #define	SITD_STS_DBE	(1 << 5)	/* data buffer error (in HC) */
@@ -565,9 +566,9 @@ struct ehci_sitd {
 
 #define SITD_ACTIVE(ehci)	cpu_to_hc32(ehci, SITD_STS_ACTIVE)
 
-	__hc32			hw_buf [2];		/* EHCI table 3-12 */
+	__hc32			hw_buf[2];		/* EHCI table 3-12 */
 	__hc32			hw_backpointer;		/* EHCI table 3-13 */
-	__hc32			hw_buf_hi [2];		/* Appendix B */
+	__hc32			hw_buf_hi[2];		/* Appendix B */
 
 	/* the rest is HCD-private */
 	dma_addr_t		sitd_dma;
@@ -578,7 +579,7 @@ struct ehci_sitd {
 	struct list_head	sitd_list;	/* list of stream's sitds */
 	unsigned		frame;
 	unsigned		index;
-} __attribute__ ((aligned (32)));
+} __aligned(32);
 
 /*-------------------------------------------------------------------------*/
 
@@ -598,7 +599,7 @@ struct ehci_fstn {
 	/* the rest is HCD-private */
 	dma_addr_t		fstn_dma;
 	union ehci_shadow	fstn_next;	/* ptr to periodic q entry */
-} __attribute__ ((aligned (32)));
+} __aligned(32);
 
 /*-------------------------------------------------------------------------*/
 
@@ -634,10 +635,10 @@ struct ehci_tt {
 /* Prepare the PORTSC wakeup flags during controller suspend/resume */
 
 #define ehci_prepare_ports_for_controller_suspend(ehci, do_wakeup)	\
-		ehci_adjust_port_wakeup_flags(ehci, true, do_wakeup);
+		ehci_adjust_port_wakeup_flags(ehci, true, do_wakeup)
 
 #define ehci_prepare_ports_for_controller_resume(ehci)			\
-		ehci_adjust_port_wakeup_flags(ehci, false, false);
+		ehci_adjust_port_wakeup_flags(ehci, false, false)
 
 /*-------------------------------------------------------------------------*/
 
@@ -731,7 +732,7 @@ ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc)
 #endif
 
 static inline unsigned int ehci_readl(const struct ehci_hcd *ehci,
-		__u32 __iomem * regs)
+				      __u32 __iomem *regs)
 {
 #ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
 	return ehci_big_endian_mmio(ehci) ?
@@ -806,7 +807,7 @@ static inline void set_ohci_hcfs(struct ehci_hcd *ehci, int operational)
 #define ehci_big_endian_desc(e)		((e)->big_endian_desc)
 
 /* cpu to ehci */
-static inline __hc32 cpu_to_hc32 (const struct ehci_hcd *ehci, const u32 x)
+static inline __hc32 cpu_to_hc32(const struct ehci_hcd *ehci, const u32 x)
 {
 	return ehci_big_endian_desc(ehci)
 		? (__force __hc32)cpu_to_be32(x)
@@ -814,14 +815,14 @@ static inline __hc32 cpu_to_hc32 (const struct ehci_hcd *ehci, const u32 x)
 }
 
 /* ehci to cpu */
-static inline u32 hc32_to_cpu (const struct ehci_hcd *ehci, const __hc32 x)
+static inline u32 hc32_to_cpu(const struct ehci_hcd *ehci, const __hc32 x)
 {
 	return ehci_big_endian_desc(ehci)
 		? be32_to_cpu((__force __be32)x)
 		: le32_to_cpu((__force __le32)x);
 }
 
-static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x)
+static inline u32 hc32_to_cpup(const struct ehci_hcd *ehci, const __hc32 *x)
 {
 	return ehci_big_endian_desc(ehci)
 		? be32_to_cpup((__force __be32 *)x)
@@ -831,18 +832,18 @@ static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x)
 #else
 
 /* cpu to ehci */
-static inline __hc32 cpu_to_hc32 (const struct ehci_hcd *ehci, const u32 x)
+static inline __hc32 cpu_to_hc32(const struct ehci_hcd *ehci, const u32 x)
 {
 	return cpu_to_le32(x);
 }
 
 /* ehci to cpu */
-static inline u32 hc32_to_cpu (const struct ehci_hcd *ehci, const __hc32 x)
+static inline u32 hc32_to_cpu(const struct ehci_hcd *ehci, const __hc32 x)
 {
 	return le32_to_cpu(x);
 }
 
-static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x)
+static inline u32 hc32_to_cpup(const struct ehci_hcd *ehci, const __hc32 *x)
 {
 	return le32_to_cpup(x);
 }
@@ -852,13 +853,13 @@ static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x)
 /*-------------------------------------------------------------------------*/
 
 #define ehci_dbg(ehci, fmt, args...) \
-	dev_dbg(ehci_to_hcd(ehci)->self.controller , fmt , ## args)
+	dev_dbg(ehci_to_hcd(ehci)->self.controller, fmt, ##args)
 #define ehci_err(ehci, fmt, args...) \
-	dev_err(ehci_to_hcd(ehci)->self.controller , fmt , ## args)
+	dev_err(ehci_to_hcd(ehci)->self.controller, fmt, ##args)
 #define ehci_info(ehci, fmt, args...) \
-	dev_info(ehci_to_hcd(ehci)->self.controller , fmt , ## args)
+	dev_info(ehci_to_hcd(ehci)->self.controller, fmt, ##args)
 #define ehci_warn(ehci, fmt, args...) \
-	dev_warn(ehci_to_hcd(ehci)->self.controller , fmt , ## args)
+	dev_warn(ehci_to_hcd(ehci)->self.controller, fmt, ##args)
 
 
 #ifndef CONFIG_DYNAMIC_DEBUG
Signature · 1 line
2.6.3
#1 lore raw

PATCH 2/4 usb: host: ehci.h: cleanup header file

This patch does align function/macro definitions.

---
 drivers/usb/host/ehci.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/usb/host/ehci.h +11 -11
index a4f5ab5..0daed80 100644
@@ -634,11 +634,11 @@ struct ehci_tt {
 
 /* Prepare the PORTSC wakeup flags during controller suspend/resume */
 
-#define ehci_prepare_ports_for_controller_suspend(ehci, do_wakeup)	\
-		ehci_adjust_port_wakeup_flags(ehci, true, do_wakeup)
+#define ehci_prepare_ports_for_controller_suspend(ehci, do_wakeup) \
+	ehci_adjust_port_wakeup_flags(ehci, true, do_wakeup)
 
-#define ehci_prepare_ports_for_controller_resume(ehci)			\
-		ehci_adjust_port_wakeup_flags(ehci, false, false)
+#define ehci_prepare_ports_for_controller_resume(ehci) \
+	ehci_adjust_port_wakeup_flags(ehci, false, false)
 
 /*-------------------------------------------------------------------------*/
 
@@ -745,18 +745,18 @@ static inline unsigned int ehci_readl(const struct ehci_hcd *ehci,
 
 #ifdef CONFIG_SOC_IMX28
 static inline void imx28_ehci_writel(const unsigned int val,
-		volatile __u32 __iomem *addr)
+				     volatile __u32 __iomem *addr)
 {
 	__asm__ ("swp %0, %0, [%1]" : : "r"(val), "r"(addr));
 }
 #else
 static inline void imx28_ehci_writel(const unsigned int val,
-		volatile __u32 __iomem *addr)
+				     volatile __u32 __iomem *addr)
 {
 }
 #endif
 static inline void ehci_writel(const struct ehci_hcd *ehci,
-		const unsigned int val, __u32 __iomem *regs)
+			       const unsigned int val, __u32 __iomem *regs)
 {
 #ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
 	ehci_big_endian_mmio(ehci) ?
@@ -874,21 +874,21 @@ struct ehci_driver_overrides {
 	size_t		extra_priv_size;
 	int		(*reset)(struct usb_hcd *hcd);
 	int		(*port_power)(struct usb_hcd *hcd,
-				int portnum, bool enable);
+				      int portnum, bool enable);
 };
 
 extern void	ehci_init_driver(struct hc_driver *drv,
-				const struct ehci_driver_overrides *over);
+				 const struct ehci_driver_overrides *over);
 extern int	ehci_setup(struct usb_hcd *hcd);
 extern int	ehci_handshake(struct ehci_hcd *ehci, void __iomem *ptr,
-				u32 mask, u32 done, int usec);
+			       u32 mask, u32 done, int usec);
 extern int	ehci_reset(struct ehci_hcd *ehci);
 
 #ifdef CONFIG_PM
 extern int	ehci_suspend(struct usb_hcd *hcd, bool do_wakeup);
 extern int	ehci_resume(struct usb_hcd *hcd, bool force_reset);
 extern void	ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
-			bool suspending, bool do_wakeup);
+					      bool suspending, bool do_wakeup);
 #endif	/* CONFIG_PM */
 
 extern int	ehci_hub_control(struct usb_hcd	*hcd, u16 typeReq, u16 wValue,
Signature · 1 line
2.6.3
#2 lore raw

Hello.

Quoted 3 lines · Geyslan G. Bem

This patch does align function/macro definitions.

USB code just uses different alignment style (2 tabs) than the other
kernel parts (like networking).

MBR, Sergei

#3 lore raw

2015-12-09 17:11 GMT-03:00 Sergei Shtylyov <[email protected]>:

Quoted 11 lines

Hello.

Quoted 3 lines · Geyslan G. Bem

This patch does align function/macro definitions.

USB code just uses different alignment style (2 tabs) than the other
kernel parts (like networking).

I see. Please, ignore it.

New code has to have 2 tabs too?

Quoted 3 lines

MBR, Sergei

Signature · 4 lines
Regards,

Geyslan G. Bem
hackingbits.com
#4 lore raw

PATCH 3/4 usb: host: ehci.h: remove duplicated return

In reply to Geyslan G. Bem

This patch removes the return of the default switch case, since 'ehci_port_speed()' already has the same default return.

---
 drivers/usb/host/ehci.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/ehci.h +1 -1
index 0daed80..49b91b6 100644
@@ -664,8 +664,8 @@ ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc)
 		case 1:
 			return USB_PORT_STAT_LOW_SPEED;
 		case 2:
+		/* fall through to default function return */
 		default:
-			return USB_PORT_STAT_HIGH_SPEED;
 		}
 	}
 	return USB_PORT_STAT_HIGH_SPEED;
Signature · 1 line
2.6.3
#5 lore raw

Re: [PATCH 3/4] usb: host: ehci.h: remove duplicated return

Hello.

Quoted 13 lines · Geyslan G. Bem

This patch removes the return of the default switch case, since 'ehci_port_speed()' already has the same default return.

---
  drivers/usb/host/ehci.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/ehci.h +0 -0
index 0daed80..49b91b6 100644

drivers/usb/host/ehci.h ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc) · line 667

Quoted 4 lines
drivers/usb/host/ehci.h +1 -0
@@ -664,8 +664,8 @@ ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc)
  		case 1:
  			return USB_PORT_STAT_LOW_SPEED;
  		case 2:
+		/* fall through to default function return */

We just don't need the above *case*.

drivers/usb/host/ehci.h ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc) · line 668

Quoted 2 lines
drivers/usb/host/ehci.h +0 -1
  		default:
-			return USB_PORT_STAT_HIGH_SPEED;

And n ow we don't need *dafault* too.

drivers/usb/host/ehci.h ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc) · line 671

Quoted 3 lines
drivers/usb/host/ehci.h +0 -0
  		}
  	}
  	return USB_PORT_STAT_HIGH_SPEED;

MBR, Sergei

#6 lore raw

Re: [PATCH 3/4] usb: host: ehci.h: remove duplicated return

2015-12-09 17:10 GMT-03:00 Sergei Shtylyov <[email protected]>:

Quoted 26 lines

Hello.

Quoted 13 lines · Geyslan G. Bem

This patch removes the return of the default switch case, since 'ehci_port_speed()' already has the same default return.

---
  drivers/usb/host/ehci.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/ehci.h +0 -0
index 0daed80..49b91b6 100644

drivers/usb/host/ehci.h ehci_port_speed(struct ehci_hcd *ehci, unsigned int · line 668

Quoted 5 lines
drivers/usb/host/ehci.h +1 -0
@@ -664,8 +664,8 @@ ehci_port_speed(struct ehci_hcd *ehci, unsigned int
 portsc)
                case 1:
                        return USB_PORT_STAT_LOW_SPEED;
                case 2:
+               /* fall through to default function return */

We just don't need the above *case*.

Quoted 5 lines

drivers/usb/host/ehci.h ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc) · line 668

Quoted 2 lines
drivers/usb/host/ehci.h +0 -1
                default:
-                       return USB_PORT_STAT_HIGH_SPEED;

And n ow we don't need *dafault* too.

Case 1 only? If not low_speed, high_speed. So, I'll change it to a simple if branch.

Quoted 8 lines
Quoted 4 lines
drivers/usb/host/ehci.h +0 -0
                }
        }
        return USB_PORT_STAT_HIGH_SPEED;

MBR, Sergei

Signature · 4 lines
Regards,

Geyslan G. Bem
hackingbits.com
#7 lore raw

Re: [PATCH 3/4] usb: host: ehci.h: remove duplicated return

Quoted 27 lines · Geyslan G. Bem

2015-12-09 17:10 GMT-03:00 Sergei Shtylyov <[email protected]>:

Quoted 26 lines

Hello.

Quoted 13 lines · Geyslan G. Bem

This patch removes the return of the default switch case, since 'ehci_port_speed()' already has the same default return.

---
  drivers/usb/host/ehci.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/ehci.h +0 -0
index 0daed80..49b91b6 100644

drivers/usb/host/ehci.h ehci_port_speed(struct ehci_hcd *ehci, unsigned int · line 668

Quoted 5 lines
drivers/usb/host/ehci.h +1 -0
@@ -664,8 +664,8 @@ ehci_port_speed(struct ehci_hcd *ehci, unsigned int
 portsc)
                case 1:
                        return USB_PORT_STAT_LOW_SPEED;
                case 2:
+               /* fall through to default function return */

We just don't need the above *case*.

Quoted 8 lines
Quoted 5 lines

drivers/usb/host/ehci.h ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc) · line 668

Quoted 2 lines
drivers/usb/host/ehci.h +0 -1
                default:
-                       return USB_PORT_STAT_HIGH_SPEED;

And n ow we don't need *dafault* too.

Case 1 only? If not low_speed, high_speed. So, I'll change it to a simple if branch.

No, please leave it as-is, it helps to understand what is going on here easier.

thanks,

greg k-h

#8 lore raw

Re: [PATCH 3/4] usb: host: ehci.h: remove duplicated return

In reply to Geyslan G. Bem
Quoted 22 lines · Geyslan G. Bem
Quoted 22 lines
Quoted 13 lines

This patch removes the return of the default switch case, since 'ehci_port_speed()' already has the same default return.

---
   drivers/usb/host/ehci.h | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/ehci.h +0 -0
index 0daed80..49b91b6 100644

drivers/usb/host/ehci.h ehci_port_speed(struct ehci_hcd *ehci, unsigned int · line 668

Quoted 5 lines
drivers/usb/host/ehci.h +1 -0
@@ -664,8 +664,8 @@ ehci_port_speed(struct ehci_hcd *ehci, unsigned int
 portsc)
                 case 1:
                         return USB_PORT_STAT_LOW_SPEED;
                 case 2:
+               /* fall through to default function return */

We just don't need the above *case*.

Quoted 8 lines
Quoted 5 lines

drivers/usb/host/ehci.h ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc) · line 668

Quoted 2 lines
drivers/usb/host/ehci.h +0 -1
                 default:
-                       return USB_PORT_STAT_HIGH_SPEED;

And n ow we don't need *dafault* too.

Case 1 only? If not low_speed, high_speed. So, I'll change it to a simple if branch.

There's *case* 0 yet.

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/usb/host/ehci.h +0 -0
                 }
         }
         return USB_PORT_STAT_HIGH_SPEED;

MBR, Sergei

#9 lore raw

Re: [PATCH 3/4] usb: host: ehci.h: remove duplicated return

In reply to Geyslan G. Bem
reproduce:

Hi Geyslan,

[auto build test ERROR on usb/usb-testing]
[also build test ERROR on v4.4-rc4 next-20151209]

url:    https://github.com/0day-ci/linux/commits/Geyslan-G-Bem/usb-host-ehci-h-cleanup-header-file/20151210-040115
base:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
config: x86_64-randconfig-s3-12100340 (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

In file included from drivers/usb/host/ehci-hcd.c:109:0:
drivers/usb/host/ehci.h: In function 'ehci_port_speed':

>> drivers/usb/host/ehci.h:668:3: error: label at end of compound statement
      default:
      ^

vim +668 drivers/usb/host/ehci.h

^1da177e Linus Torvalds 2005-04-16  662  		case 0:
^1da177e Linus Torvalds 2005-04-16  663  			return 0;
^1da177e Linus Torvalds 2005-04-16  664  		case 1:
288ead45 Alan Stern     2010-03-04  665  			return USB_PORT_STAT_LOW_SPEED;
^1da177e Linus Torvalds 2005-04-16  666  		case 2:
50691528 Geyslan G. Bem 2015-12-09  667  		/* fall through to default function return */
^1da177e Linus Torvalds 2005-04-16 @668  		default:
^1da177e Linus Torvalds 2005-04-16  669  		}
^1da177e Linus Torvalds 2005-04-16  670  	}
288ead45 Alan Stern     2010-03-04  671  	return USB_PORT_STAT_HIGH_SPEED;

:::::: The code at line 668 was first introduced by commit :::::: 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 Linux-2.6.12-rc2

:::::: TO: Linus Torvalds <[email protected]> :::::: CC: Linus Torvalds <[email protected]>

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

#10 lore raw

Re: [PATCH 3/4] usb: host: ehci.h: remove duplicated return

In reply to Geyslan G. Bem
reproduce:

Hi Geyslan,

[auto build test ERROR on usb/usb-testing]
[also build test ERROR on v4.4-rc4 next-20151209]

url:    https://github.com/0day-ci/linux/commits/Geyslan-G-Bem/usb-host-ehci-h-cleanup-header-file/20151210-040115
base:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
config: x86_64-randconfig-s0-12100345 (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

In file included from drivers/usb/chipidea/host.c:29:0:
drivers/usb/chipidea/../host/ehci.h: In function 'ehci_port_speed':

>> drivers/usb/chipidea/../host/ehci.h:668:3: error: label at end of compound statement
      default:
      ^

vim +668 drivers/usb/chipidea/../host/ehci.h

^1da177e Linus Torvalds 2005-04-16  662  		case 0:
^1da177e Linus Torvalds 2005-04-16  663  			return 0;
^1da177e Linus Torvalds 2005-04-16  664  		case 1:
288ead45 Alan Stern     2010-03-04  665  			return USB_PORT_STAT_LOW_SPEED;
^1da177e Linus Torvalds 2005-04-16  666  		case 2:
50691528 Geyslan G. Bem 2015-12-09  667  		/* fall through to default function return */
^1da177e Linus Torvalds 2005-04-16 @668  		default:
^1da177e Linus Torvalds 2005-04-16  669  		}
^1da177e Linus Torvalds 2005-04-16  670  	}
288ead45 Alan Stern     2010-03-04  671  	return USB_PORT_STAT_HIGH_SPEED;

:::::: The code at line 668 was first introduced by commit :::::: 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 Linux-2.6.12-rc2

:::::: TO: Linus Torvalds <[email protected]> :::::: CC: Linus Torvalds <[email protected]>

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

#11 lore raw

Re: [PATCH 3/4] usb: host: ehci.h: remove duplicated return

2015-12-09 18:24 GMT-03:00 kbuild test robot <[email protected]>:

Quoted 12 lines

Hi Geyslan,

[auto build test ERROR on usb/usb-testing]
[also build test ERROR on v4.4-rc4 next-20151209]

url:    https://github.com/0day-ci/linux/commits/Geyslan-G-Bem/usb-host-ehci-h-cleanup-header-file/20151210-040115
base:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
config: x86_64-randconfig-s0-12100345 (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64
Quoted 6 lines

All errors (new ones prefixed by >>):

In file included from drivers/usb/chipidea/host.c:29:0:
drivers/usb/chipidea/../host/ehci.h: In function 'ehci_port_speed':

Quoted 1 line
Quoted 1 line

drivers/usb/chipidea/../host/ehci.h:668:3: error: label at end of compound statement

default:

Missed the break. Coul be removed too.

Quoted 21 lines
      ^

vim +668 drivers/usb/chipidea/../host/ehci.h

^1da177e Linus Torvalds 2005-04-16  662                 case 0:
^1da177e Linus Torvalds 2005-04-16  663                         return 0;
^1da177e Linus Torvalds 2005-04-16  664                 case 1:
288ead45 Alan Stern     2010-03-04  665                         return USB_PORT_STAT_LOW_SPEED;
^1da177e Linus Torvalds 2005-04-16  666                 case 2:
50691528 Geyslan G. Bem 2015-12-09  667                 /* fall through to default function return */
^1da177e Linus Torvalds 2005-04-16 @668                 default:
^1da177e Linus Torvalds 2005-04-16  669                 }
^1da177e Linus Torvalds 2005-04-16  670         }
288ead45 Alan Stern     2010-03-04  671         return USB_PORT_STAT_HIGH_SPEED;

:::::: The code at line 668 was first introduced by commit :::::: 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 Linux-2.6.12-rc2

:::::: TO: Linus Torvalds <[email protected]> :::::: CC: Linus Torvalds <[email protected]>

Quoted 6 lines

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

No, please leave it as-is, it helps to understand what is going on here easier.

Ok. Let it go. :)

Quoted 3 lines

thanks,

greg k-h

Signature · 4 lines
Regards,

Geyslan G. Bem
hackingbits.com
#12 lore raw

PATCH 4/4 usb: host: ehci.h: use flexible array instead of zero-length array

In reply to Geyslan G. Bem

C99 standardized flexible arrays 'array[]'. The zero-length ones are old gcc implementation 'array[0]'.

---
 drivers/usb/host/ehci.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/host/ehci.h +2 -2
index 49b91b6..0ee1cdb 100644
@@ -264,7 +264,7 @@ struct ehci_hcd {			/* one per controller */
 	struct list_head	tt_list;
 
 	/* platform-specific data -- must come last */
-	unsigned long		priv[0] __aligned(sizeof(s64));
+	unsigned long		priv[] __aligned(sizeof(s64));
 };
 
 /* convert between an HCD pointer and the corresponding EHCI_HCD */
@@ -463,7 +463,7 @@ struct ehci_iso_sched {
 	struct list_head	td_list;
 	unsigned		span;
 	unsigned		first_packet;
-	struct ehci_iso_packet	packet[0];
+	struct ehci_iso_packet	packet[];
 };
 
 /*
Signature · 1 line
2.6.3
#13 lore raw
In reply to Geyslan G. Bem
Quoted 3 lines · Geyslan G. Bem

This patch silences
- A coccinelle warning 'scripts/coccinelle/misc/compare_const_fl.cocci'
- All the errors and many warnings shown by checkpatch

"all" is a lot. Please break down each type of change to a separate patch. Then do a patch with the coccinelle warning fixes as well. That will make these patches a lot smaller and easier to review.

thanks,

greg k-h

#14 lore raw

2015-12-09 17:09 GMT-03:00 Greg Kroah-Hartman <[email protected]>:

Quoted 8 lines · Geyslan G. Bem
Quoted 3 lines

This patch silences
- A coccinelle warning 'scripts/coccinelle/misc/compare_const_fl.cocci'
- All the errors and many warnings shown by checkpatch

"all" is a lot. Please break down each type of change to a separate patch. Then do a patch with the coccinelle warning fixes as well. That will make these patches a lot smaller and easier to review.

Ok. Doing.

Quoted 4 lines

thanks,

greg k-h

Signature · 4 lines
Regards,

Geyslan G. Bem
hackingbits.com