Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756926AbYJVRHe (ORCPT ); Wed, 22 Oct 2008 13:07:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752562AbYJVRHN (ORCPT ); Wed, 22 Oct 2008 13:07:13 -0400 Received: from ey-out-2122.google.com ([74.125.78.25]:65025 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752500AbYJVRHK (ORCPT ); Wed, 22 Oct 2008 13:07:10 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=to:subject:date:user-agent:cc:references:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :message-id:from; b=xEduW5GcawmFg5ens66LtofJZV6bpSEv84P1omhY3pBGG9VCDhsWDYbcF575P1qrb/ 5TGjvjxMhCVb8O5qu6JUUkZevw3ZHuSgInvcps9xhG82+WkkTfRADlkNE4SpSh1a7TfB Nk8BJMzPJ0ghJ4yMwHGJD3O07HXHtfQNgKBnM= To: Zhaolei Subject: Re: [PATCH] Fix debugfs_create_*'s error checking method for wireless/rt2x00/ Date: Wed, 22 Oct 2008 19:07:04 +0200 User-Agent: KMail/1.9.9 Cc: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, rt2400-devel@lists.sourceforge.net, "John W. Linville" References: <48FEED4D.3000208@cn.fujitsu.com> In-Reply-To: <48FEED4D.3000208@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200810221907.04946.IvDoorn@gmail.com> From: Ivo van Doorn Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3911 Lines: 109 On Wednesday 22 October 2008, Zhaolei wrote: > Hi, > > debugfs_create_*() returns NULL if an error occurs, returns -ENODEV > when debugfs is not enabled in the kernel. > > Signed-off-by: Zhao Lei Looks good. Thanks. John, could you pull this into wireless-testing? Thanks! Signed-off-by: Ivo van Doorn > --- > drivers/net/wireless/rt2x00/rt2x00debug.c | 21 ++++++++++++--------- > 1 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c > index 5cf4c85..b380cd3 100644 > --- a/drivers/net/wireless/rt2x00/rt2x00debug.c > +++ b/drivers/net/wireless/rt2x00/rt2x00debug.c > @@ -587,29 +587,29 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev) > intf->driver_folder = > debugfs_create_dir(intf->rt2x00dev->ops->name, > rt2x00dev->hw->wiphy->debugfsdir); > - if (IS_ERR(intf->driver_folder)) > + if (IS_ERR(intf->driver_folder) || !intf->driver_folder) > goto exit; > > intf->driver_entry = > rt2x00debug_create_file_driver("driver", intf, &intf->driver_blob); > - if (IS_ERR(intf->driver_entry)) > + if (IS_ERR(intf->driver_entry) || !intf->driver_entry) > goto exit; > > intf->chipset_entry = > rt2x00debug_create_file_chipset("chipset", > intf, &intf->chipset_blob); > - if (IS_ERR(intf->chipset_entry)) > + if (IS_ERR(intf->chipset_entry) || !intf->chipset_entry) > goto exit; > > intf->dev_flags = debugfs_create_file("dev_flags", S_IRUSR, > intf->driver_folder, intf, > &rt2x00debug_fop_dev_flags); > - if (IS_ERR(intf->dev_flags)) > + if (IS_ERR(intf->dev_flags) || !intf->dev_flags) > goto exit; > > intf->register_folder = > debugfs_create_dir("register", intf->driver_folder); > - if (IS_ERR(intf->register_folder)) > + if (IS_ERR(intf->register_folder) || !intf->register_folder) > goto exit; > > #define RT2X00DEBUGFS_CREATE_REGISTER_ENTRY(__intf, __name) \ > @@ -619,7 +619,8 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev) > S_IRUSR | S_IWUSR, \ > (__intf)->register_folder, \ > &(__intf)->offset_##__name); \ > - if (IS_ERR((__intf)->__name##_off_entry)) \ > + if (IS_ERR((__intf)->__name##_off_entry) \ > + || !(__intf)->__name##_off_entry) \ > goto exit; \ > \ > (__intf)->__name##_val_entry = \ > @@ -627,7 +628,8 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev) > S_IRUSR | S_IWUSR, \ > (__intf)->register_folder, \ > (__intf), &rt2x00debug_fop_##__name);\ > - if (IS_ERR((__intf)->__name##_val_entry)) \ > + if (IS_ERR((__intf)->__name##_val_entry) \ > + || !(__intf)->__name##_val_entry) \ > goto exit; \ > }) > > @@ -640,13 +642,14 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev) > > intf->queue_folder = > debugfs_create_dir("queue", intf->driver_folder); > - if (IS_ERR(intf->queue_folder)) > + if (IS_ERR(intf->queue_folder) || !intf->queue_folder) > goto exit; > > intf->queue_frame_dump_entry = > debugfs_create_file("dump", S_IRUSR, intf->queue_folder, > intf, &rt2x00debug_fop_queue_dump); > - if (IS_ERR(intf->queue_frame_dump_entry)) > + if (IS_ERR(intf->queue_frame_dump_entry) > + || !intf->queue_frame_dump_entry) > goto exit; > > skb_queue_head_init(&intf->frame_dump_skbqueue); > -- 1.5.5.3 > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/