From: Alan Stern Subject: [PATCH] usb-storage: don't call utsname() Date: Wed, 21 May 2008 13:51:17 -0400 (EDT) Message-ID: References: <20080521123700.GA8770@infradead.org> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Christoph Hellwig , "Frank Ch. Eigler" , Adrian Bunk , USB Storage list , Kernel development list , "David S. Miller" , , Andrew Morton , , To: Greg KH , Matthew Dharm Return-path: Received: from iolanthe.rowland.org ([192.131.102.54]:60468 "HELO iolanthe.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1757839AbYEURvS (ORCPT ); Wed, 21 May 2008 13:51:18 -0400 In-Reply-To: <20080521123700.GA8770@infradead.org> Sender: linux-nfs-owner@vger.kernel.org List-ID: This patch (as1100) replaces the core-kernel function call to utsname() in usb-storage with the UTS_RELEASE macro. It's used only for warning about extra unusual_devs entries. Signed-off-by: Alan Stern --- Index: usb-2.6/drivers/usb/storage/usb.c =================================================================== --- usb-2.6.orig/drivers/usb/storage/usb.c +++ usb-2.6/drivers/usb/storage/usb.c @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include @@ -531,8 +531,8 @@ static int get_device_info(struct us_dat if (msg >= 0 && !(us->fflags & US_FL_NEED_OVERRIDE)) printk(KERN_NOTICE USB_STORAGE "This device " "(%04x,%04x,%04x S %02x P %02x)" - " has %s in unusual_devs.h (kernel" - " %s)\n" + " has %s in unusual_devs.h (kernel " + UTS_RELEASE ")\n" " Please send a copy of this message to " " and " "\n", @@ -541,8 +541,7 @@ static int get_device_info(struct us_dat le16_to_cpu(ddesc->bcdDevice), idesc->bInterfaceSubClass, idesc->bInterfaceProtocol, - msgs[msg], - utsname()->release); + msgs[msg]); } return 0;