USB: fix ohci.h over-use warnings (abc9404b) · Commits · 戴 / test

When u132-hcd is built, it includes local header ohci.h, which appears to have been intended only for use by ohci-hcd. This throws warnings about functions which are defined and not used. The warnings thrown are because three small functions are implemented in the header, but not declared 'inline', a rather strange affair. Since these functions are small, let's go ahead and define them as 'inline', just like the inline functions surrounding them. This makes things more consistent, and kills the warnings. Signed-off-by:

Jeff Garzik <jeff@garzik.org> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

drivers/usb/host/ohci.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -602,7 +602,7 @@ static inline void disable (struct ohci_hcd *ohci)
		#define FIT (1 << 31)
		#define LSTHRESH 0x628 /* lowspeed bit threshold */

		static void periodic_reinit (struct ohci_hcd *ohci)
		static inline void periodic_reinit (struct ohci_hcd *ohci)
		{
		u32 fi = ohci->fminterval & 0x03fff;
		u32 fit = ohci_readl(ohci, &ohci->regs->fminterval) & FIT;
		@@ -626,11 +626,11 @@ static void periodic_reinit (struct ohci_hcd *ohci)
		temp = ohci_readl (hc, &hc->regs->roothub.register); \
		temp; })

		static u32 roothub_a (struct ohci_hcd *hc)
		static inline u32 roothub_a (struct ohci_hcd *hc)
		{ return read_roothub (hc, a, 0xfc0fe000); }
		static inline u32 roothub_b (struct ohci_hcd *hc)
		{ return ohci_readl (hc, &hc->regs->roothub.b); }
		static inline u32 roothub_status (struct ohci_hcd *hc)
		{ return ohci_readl (hc, &hc->regs->roothub.status); }
		static u32 roothub_portstatus (struct ohci_hcd *hc, int i)
		static inline u32 roothub_portstatus (struct ohci_hcd *hc, int i)
		{ return read_roothub (hc, portstatus [i], 0xffe0fce0); }

Admin message