From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754090Ab0GNJkF (ORCPT ); Wed, 14 Jul 2010 05:40:05 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:37212 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752895Ab0GNJkD (ORCPT ); Wed, 14 Jul 2010 05:40:03 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=ldtCmuJoIS6E/SsUcqVCYt0GQGO5/1NZ6d+d2nNTaLBPURSZx/ArbCi5IEy+MUyC1F dWpHnLGUq23a6Gcmc9KH8g9yJaw7KliaxcrBMGjjoMZnoGQkmobdjb3DJ7gyJElkIF53 wlE5Q4+zU77BNqVStDxJtJHUdmAhghSNbNFyc= From: Changli Gao To: Greg Kroah-Hartman Cc: "Jike Song" , linux-kernel@vger.kernel.org, Changli Gao Subject: [PATCH] drivers: code cleanups Date: Wed, 14 Jul 2010 17:37:26 +0800 Message-Id: <1279100246-5758-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org drivers: code cleanups the first three goto clauses caused kfree(NULL), and the error code returned by kset->uevent_ops->uevent() wasn't passed to the caller of show_uevent(). This patch also eliminates the unnecessary initializations of env and count. Signed-off-by: Changli Gao ---- drivers/base/core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 38bbbd0..33fa36d 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -274,9 +274,8 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr, { struct kobject *top_kobj; struct kset *kset; - struct kobj_uevent_env *env = NULL; + struct kobj_uevent_env *env; int i; - size_t count = 0; int retval; /* search the kset, the device belongs to */ @@ -284,16 +283,16 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr, while (!top_kobj->kset && top_kobj->parent) top_kobj = top_kobj->parent; if (!top_kobj->kset) - goto out; + return 0; kset = top_kobj->kset; if (!kset->uevent_ops || !kset->uevent_ops->uevent) - goto out; + return 0; /* respect filter */ if (kset->uevent_ops && kset->uevent_ops->filter) if (!kset->uevent_ops->filter(kset, &dev->kobj)) - goto out; + return 0; env = kzalloc(sizeof(struct kobj_uevent_env), GFP_KERNEL); if (!env) @@ -305,11 +304,12 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr, goto out; /* copy keys to file */ + retval = 0; for (i = 0; i < env->envp_idx; i++) - count += sprintf(&buf[count], "%s\n", env->envp[i]); + retval += sprintf(&buf[retval], "%s\n", env->envp[i]); out: kfree(env); - return count; + return retval; } static ssize_t store_uevent(struct device *dev, struct device_attribute *attr,