Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8234509c authored by David Rientjes's avatar David Rientjes Committed by Greg Kroah-Hartman
Browse files

USB: use function attribute __maybe_unused 



Substitute USB instances of __attribute__ ((unused)) functions with the
newly introduced __maybe_unused.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ba02978a

drivers/usb/gadget/pxa2xx_udc.h

+3 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static const char *state_name[] = { 
#    define UDC_DEBUG DBG_NORMAL

#endif



static void __attribute__ ((__unused__))

static void __maybe_unused

dump_udccr(const char *label)

{

	u32	udccr = UDCCR;
@@ -220,7 +220,7 @@ dump_udccr(const char *label) 
		(udccr & UDCCR_UDE) ? " ude" : "");

}



static void __attribute__ ((__unused__))

static void __maybe_unused

dump_udccs0(const char *label)

{

	u32		udccs0 = UDCCS0;
@@ -237,7 +237,7 @@ dump_udccs0(const char *label) 
		(udccs0 & UDCCS0_OPR) ? " opr" : "");

}



static void __attribute__ ((__unused__))

static void __maybe_unused

dump_state(struct pxa2xx_udc *dev)

{

	u32		tmp;

drivers/usb/host/ehci-dbg.c

+11 −11
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static inline void dbg_hcc_params (struct ehci_hcd *ehci, char *label) {} 


#ifdef	DEBUG



static void __attribute__((__unused__))

static void __maybe_unused

dbg_qtd (const char *label, struct ehci_hcd *ehci, struct ehci_qtd *qtd)

{

	ehci_dbg(ehci, "%s td %p n%08x %08x t%08x p0=%08x\n", label, qtd,
@@ -131,7 +131,7 @@ dbg_qtd (const char *label, struct ehci_hcd *ehci, struct ehci_qtd *qtd) 
			hc32_to_cpup(ehci, &qtd->hw_buf[4]));

}



static void __attribute__((__unused__))

static void __maybe_unused

dbg_qh (const char *label, struct ehci_hcd *ehci, struct ehci_qh *qh)

{

	ehci_dbg (ehci, "%s qh %p n%08x info %x %x qtd %x\n", label,
@@ -140,7 +140,7 @@ dbg_qh (const char *label, struct ehci_hcd *ehci, struct ehci_qh *qh) 
	dbg_qtd ("overlay", ehci, (struct ehci_qtd *) &qh->hw_qtd_next);

}



static void __attribute__((__unused__))

static void __maybe_unused

dbg_itd (const char *label, struct ehci_hcd *ehci, struct ehci_itd *itd)

{

	ehci_dbg (ehci, "%s [%d] itd %p, next %08x, urb %p\n",
@@ -171,7 +171,7 @@ dbg_itd (const char *label, struct ehci_hcd *ehci, struct ehci_itd *itd) 
		itd->index[6], itd->index[7]);

}



static void __attribute__((__unused__))

static void __maybe_unused

dbg_sitd (const char *label, struct ehci_hcd *ehci, struct ehci_sitd *sitd)

{

	ehci_dbg (ehci, "%s [%d] sitd %p, next %08x, urb %p\n",
@@ -186,7 +186,7 @@ dbg_sitd (const char *label, struct ehci_hcd *ehci, struct ehci_sitd *sitd) 
		hc32_to_cpu(ehci, sitd->hw_buf[1]));

}



static int __attribute__((__unused__))

static int __maybe_unused

dbg_status_buf (char *buf, unsigned len, const char *label, u32 status)

{

	return scnprintf (buf, len,
@@ -205,7 +205,7 @@ dbg_status_buf (char *buf, unsigned len, const char *label, u32 status) 
		);

}



static int __attribute__((__unused__))

static int __maybe_unused

dbg_intr_buf (char *buf, unsigned len, const char *label, u32 enable)

{

	return scnprintf (buf, len,
@@ -273,23 +273,23 @@ dbg_port_buf (char *buf, unsigned len, const char *label, int port, u32 status) 
}



#else

static inline void __attribute__((__unused__))

static inline void __maybe_unused

dbg_qh (char *label, struct ehci_hcd *ehci, struct ehci_qh *qh)

{}



static inline int __attribute__((__unused__))

static inline int __maybe_unused

dbg_status_buf (char *buf, unsigned len, const char *label, u32 status)

{ return 0; }



static inline int __attribute__((__unused__))

static inline int __maybe_unused

dbg_command_buf (char *buf, unsigned len, const char *label, u32 command)

{ return 0; }



static inline int __attribute__((__unused__))

static inline int __maybe_unused

dbg_intr_buf (char *buf, unsigned len, const char *label, u32 enable)

{ return 0; }



static inline int __attribute__((__unused__))

static inline int __maybe_unused

dbg_port_buf (char *buf, unsigned len, const char *label, int port, u32 status)

{ return 0; }

drivers/usb/host/ohci-dbg.c

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
/* debug| print the main components of an URB

 * small: 0) header + data packets 1) just header

 */

static void __attribute__((unused))

static void __maybe_unused

urb_print (struct urb * urb, char * str, int small)

{

	unsigned int pipe= urb->pipe;
@@ -338,7 +338,7 @@ static void ohci_dump_td (const struct ohci_hcd *ohci, const char *label, 
}



/* caller MUST own hcd spinlock if verbose is set! */

static void __attribute__((unused))

static void __maybe_unused

ohci_dump_ed (const struct ohci_hcd *ohci, const char *label,

		const struct ed *ed, int verbose)

{