USB: OHCI: fix new compiler warnings
This patch (as1515) fixes some unavoidably dumb compiler warnings: CC [M] drivers/usb/renesas_usbhs/mod.o In file included from drivers/usb/host/ohci-hcd.c:101:0: drivers/usb/host/ohci-dbg.c: In function ‘fill_registers_buffer’: drivers/usb/host/ohci-dbg.c:656:2: warning: the comparison will always evaluate as ‘true’ for the address of ‘next’ will never be NULL [-Waddress] drivers/usb/host/ohci-dbg.c:675:3: warning: the comparison will always evaluate as ‘true’ for the address of ‘next’ will never be NULL [-Waddress] Instead of trying to fix the macro to work under all cirumstances, just add a second macro for use in cases where the "next" argument is the address of a local variable. Unfortunately the macro cannot be replaced by a real subroutine, because there's no va_list version of ohci_dbg() or dev_dbg(). Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
3297f86a3d
commit
194b3af4eb
|
@ -82,6 +82,14 @@ urb_print(struct urb * urb, char * str, int small, int status)
|
||||||
ohci_dbg(ohci,format, ## arg ); \
|
ohci_dbg(ohci,format, ## arg ); \
|
||||||
} while (0);
|
} while (0);
|
||||||
|
|
||||||
|
/* Version for use where "next" is the address of a local variable */
|
||||||
|
#define ohci_dbg_nosw(ohci, next, size, format, arg...) \
|
||||||
|
do { \
|
||||||
|
unsigned s_len; \
|
||||||
|
s_len = scnprintf(*next, *size, format, ## arg); \
|
||||||
|
*size -= s_len; *next += s_len; \
|
||||||
|
} while (0);
|
||||||
|
|
||||||
|
|
||||||
static void ohci_dump_intr_mask (
|
static void ohci_dump_intr_mask (
|
||||||
struct ohci_hcd *ohci,
|
struct ohci_hcd *ohci,
|
||||||
|
@ -653,7 +661,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
|
||||||
|
|
||||||
/* dump driver info, then registers in spec order */
|
/* dump driver info, then registers in spec order */
|
||||||
|
|
||||||
ohci_dbg_sw (ohci, &next, &size,
|
ohci_dbg_nosw(ohci, &next, &size,
|
||||||
"bus %s, device %s\n"
|
"bus %s, device %s\n"
|
||||||
"%s\n"
|
"%s\n"
|
||||||
"%s\n",
|
"%s\n",
|
||||||
|
@ -672,7 +680,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
|
||||||
|
|
||||||
/* hcca */
|
/* hcca */
|
||||||
if (ohci->hcca)
|
if (ohci->hcca)
|
||||||
ohci_dbg_sw (ohci, &next, &size,
|
ohci_dbg_nosw(ohci, &next, &size,
|
||||||
"hcca frame 0x%04x\n", ohci_frame_no(ohci));
|
"hcca frame 0x%04x\n", ohci_frame_no(ohci));
|
||||||
|
|
||||||
/* other registers mostly affect frame timings */
|
/* other registers mostly affect frame timings */
|
||||||
|
|
Loading…
Reference in New Issue