From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?iso-8859-1?q?H=FCwe?= Subject: Re: [PATCH -next] staging/cxt1e1: Convert bare printks to pr_ Date: Wed, 5 May 2010 14:21:14 +0200 Message-ID: <201005051421.14647.PeterHuewe@gmx.de> References: <20100503151619.f75e3a80.sfr@canb.auug.org.au> <20100503110657.00b4e140.randy.dunlap@oracle.com> <1272915196.30040.163.camel@Joe-Laptop.home> Mime-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.gmx.net ([213.165.64.20]:12746 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S932090Ab0EEMVV (ORCPT ); Wed, 5 May 2010 08:21:21 -0400 In-Reply-To: <1272915196.30040.163.camel@Joe-Laptop.home> Sender: linux-next-owner@vger.kernel.org List-ID: To: devel@linuxdriverproject.org Cc: Joe Perches , Randy Dunlap , devel@driverdev.osuosl.org, Stephen Rothwell , gregkh@suse.de, support@sbei.com, LKML , linux-next@vger.kernel.org, support@onestopsystems.com Am Montag 03 Mai 2010 21:33:16 schrieb Joe Perches: > Added #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > A few line splits for long arguments > A couple of embedded function names converted to "%s", __func__ > Removed some uses of THIS_MODULE->name > > Signed-off-by: Joe Perches Hi, I applied Joe's patch, but unfortunately it misses out one part of Randy's original patch, i.e. the conversion in line 286 of hwprobe.c. Joe: Can you perhaps add this to your patch? Thanks, Peter Signed-off-by: Peter Huewe --- Copied from original Patch by Randy dunlap --- linux-next-20100503.orig/drivers/staging/cxt1e1/hwprobe.c +++ linux-next-20100503/drivers/staging/cxt1e1/hwprobe.c @@ -282,7 +283,7 @@ c4_hdw_init (struct pci_dev * pdev, int */ char *cp = hi->devname; - strcpy (cp, THIS_MODULE->name); + strcpy (cp, KBUILD_MODNAME); cp += strlen (cp); /* reposition */ *cp++ = '-'; *cp++ = '0' + (found / 2); /* there are two found interfaces per