[PATCH 4/4] USB: EHCI: Rearrange create_companion_file() to avoid GCC-4.6 warnings.

From: David Daney
Date: Tue Jan 25 2011 - 13:00:29 EST

In create_companion_file() there is a bogus assignemt to i created for
the express purpose of avoiding an ignored return value warning.

With pre-release GCC-4.6, this causes a 'set but not used' warning.

Kick the problem further down the road by just returning i. All the
callers of create_companion_file() ignore its return value, so all is

o No warnings are issued.

o We still subvert the desires of the authors of device_create_file()
by ignorning error conditions.

Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
drivers/usb/host/ehci-hub.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 796ea0c..5aa6c49 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -531,14 +531,15 @@ static ssize_t store_companion(struct device *dev,
static DEVICE_ATTR(companion, 0644, show_companion, store_companion);

-static inline void create_companion_file(struct ehci_hcd *ehci)
+static inline int create_companion_file(struct ehci_hcd *ehci)
- int i;
+ int i = 0;

/* with integrated TT there is no companion! */
if (!ehci_is_TDI(ehci))
i = device_create_file(ehci_to_hcd(ehci)->self.controller,
+ return i;

static inline void remove_companion_file(struct ehci_hcd *ehci)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/