From patchwork Fri Nov 5 22:24:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Torvalds X-Patchwork-Id: 304892 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA5MQ80O030293 for ; Fri, 5 Nov 2010 22:26:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754978Ab0KEWZc (ORCPT ); Fri, 5 Nov 2010 18:25:32 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:46869 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752641Ab0KEWZa (ORCPT ); Fri, 5 Nov 2010 18:25:30 -0400 Received: from mail-iw0-f174.google.com (mail-iw0-f174.google.com [209.85.214.174]) (authenticated bits=0) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id oA5MOvQW003697 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=FAIL); Fri, 5 Nov 2010 15:24:57 -0700 Received: by iwn41 with SMTP id 41so1401820iwn.19 for ; Fri, 05 Nov 2010 15:24:57 -0700 (PDT) Received: by 10.231.20.65 with SMTP id e1mr2229409ibb.32.1288995896881; Fri, 05 Nov 2010 15:24:56 -0700 (PDT) MIME-Version: 1.0 Received: by 10.231.14.134 with HTTP; Fri, 5 Nov 2010 15:24:36 -0700 (PDT) In-Reply-To: <20101103161837.fad11d79.randy.dunlap@oracle.com> References: <20101103161837.fad11d79.randy.dunlap@oracle.com> From: Linus Torvalds Date: Fri, 5 Nov 2010 15:24:36 -0700 Message-ID: Subject: Re: Linux 2.6.37-rc1 (libipw remove_proc_entry warning) To: Randy Dunlap , Pavel Roskin , "John W. Linville" Cc: linux-wireless@vger.kernel.org, Linux Kernel Mailing List X-Spam-Status: No, hits=-2.919 required=5 tests=AWL,BAYES_00 X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 05 Nov 2010 22:26:08 +0000 (UTC) drivers/net/wireless/ipw2x00/libipw_module.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c index 32dee2c..d5ef696 100644 --- a/drivers/net/wireless/ipw2x00/libipw_module.c +++ b/drivers/net/wireless/ipw2x00/libipw_module.c @@ -54,6 +54,7 @@ #define DRV_DESCRIPTION "802.11 data/management/control stack" #define DRV_NAME "libipw" +#define DRV_PROCNAME "ieee80211" #define DRV_VERSION LIBIPW_VERSION #define DRV_COPYRIGHT "Copyright (C) 2004-2005 Intel Corporation " @@ -293,16 +294,16 @@ static int __init libipw_init(void) struct proc_dir_entry *e; libipw_debug_level = debug; - libipw_proc = proc_mkdir("ieee80211", init_net.proc_net); + libipw_proc = proc_mkdir(DRV_PROCNAME, init_net.proc_net); if (libipw_proc == NULL) { - LIBIPW_ERROR("Unable to create " DRV_NAME + LIBIPW_ERROR("Unable to create " DRV_PROCNAME " proc directory\n"); return -EIO; } e = proc_create("debug_level", S_IRUGO | S_IWUSR, libipw_proc, &debug_level_proc_fops); if (!e) { - remove_proc_entry(DRV_NAME, init_net.proc_net); + remove_proc_entry(DRV_PROCNAME, init_net.proc_net); libipw_proc = NULL; return -EIO; } @@ -319,7 +320,7 @@ static void __exit libipw_exit(void) #ifdef CONFIG_LIBIPW_DEBUG if (libipw_proc) { remove_proc_entry("debug_level", libipw_proc); - remove_proc_entry(DRV_NAME, init_net.proc_net); + remove_proc_entry(DRV_PROCNAME, init_net.proc_net); libipw_proc = NULL; } #endif /* CONFIG_LIBIPW_DEBUG */