From patchwork Fri Oct 20 16:00:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maurizio Lombardi X-Patchwork-Id: 156206 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp1157224vqb; Fri, 20 Oct 2023 09:01:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFa1sKMjQQVjZx4B1GrIxFvGksL8aKXjqYszb5ZWYznrZIfQPOH2Kg9B/wbWz7+x7K/a/WI X-Received: by 2002:a05:6a00:1255:b0:68e:2d59:b1f3 with SMTP id u21-20020a056a00125500b0068e2d59b1f3mr2035370pfi.13.1697817717431; Fri, 20 Oct 2023 09:01:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697817717; cv=none; d=google.com; s=arc-20160816; b=zq2e1uEwPl6PEjrxGMDxlB6UgFFNodjFhfYU6TjavlR7CPrAzUsXnq5hvU26nZlhOi bv3p7GJ8a1Gc1GP1NU/+2VIOydSGrleS32e53EQ1u9orXM2zP3+kqkLtr4vVLshveIiV p8uX2+/OduAL7TH0YhG+52essKEiW0TtbOFL5NU1VTiwNeJxfDe6EcUp5zCWvG+udviN pZdArgqDchKrzUAEOtsG/Pz55BaJdQ78GZkyLcr4abYBGZa81T7JXjOWC+6NmiHIY3qB WRxNLFbL9dnLn+KeK+08B7Fv07dlCjGID6BjvjAQ9QBdouCtJAsbjqK6cO67KFUHUY1h TEsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=NcvcHF6syyTnw+TlLVd2nH8ZMZCU48+hIK7XQq6iEm0=; fh=/HNfN5sKYyD5/+w5ZCzXtqPHTPJVT6T5Km4Tk6SXW3Q=; b=IjwOTEYq/dlgObDygcp/cAGZVqcO299vjRUMLyTEB0PzPpWi/AVKAI280cELEVKV1U KsjpUJNgbHHC9fHT68XurFj469aAtSEBMUfCKFeLElpRmLeqicf+xINDDyy6LxFZSBGI HiBu0tSGV2RDL7EeIoEFY7X1sj292ZtnoQRsJLsi0425GkRbHHTNztm8LOP8fH7uPLbg +dn5ES5MxWpD4+/ewWLz27lWBZH5s7JWBPL3vNSuQ0Z8IfivqyUpcd2AdZ+zSDXv4hRR yrm3yzt5s66PyNgjBvcTe3hShENN6hLKjZOL4cwkSJSHBop2TTwETPbxirIE/qbstwjj 3k4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VSit08nN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id b6-20020aa79506000000b006be053633ecsi2206399pfp.388.2023.10.20.09.01.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 09:01:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VSit08nN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B95D982F9274; Fri, 20 Oct 2023 09:01:49 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377863AbjJTQBp (ORCPT + 26 others); Fri, 20 Oct 2023 12:01:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377871AbjJTQBk (ORCPT ); Fri, 20 Oct 2023 12:01:40 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2094C124 for ; Fri, 20 Oct 2023 09:00:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697817651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=NcvcHF6syyTnw+TlLVd2nH8ZMZCU48+hIK7XQq6iEm0=; b=VSit08nNsXovdnumtAHWn93pDIK5n3IuS5QJEFgzATGDoz0qy8UT19R9Eov/R5O9JlRzs4 EuYpbVsUlpxU2KfTQ/kQAGwKTdLFGBhMVHNAuXjbBmsGE//EKcbAbexm4Bh3/pHp3qwRJP 4xgYzeTsfW0FNhBpMq1lEU2cSfY2BLQ= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-586-FYn6_4HoM46po6gwZ1h0Hg-1; Fri, 20 Oct 2023 12:00:45 -0400 X-MC-Unique: FYn6_4HoM46po6gwZ1h0Hg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C811F3C025C8; Fri, 20 Oct 2023 16:00:44 +0000 (UTC) Received: from kalibr.redhat.com (unknown [10.47.238.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D9B32026D4C; Fri, 20 Oct 2023 16:00:43 +0000 (UTC) From: Maurizio Lombardi To: gregkh@linuxfoundation.org Cc: rafael@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] driver core: class: remove boilerplate code Date: Fri, 20 Oct 2023 18:00:42 +0200 Message-Id: <20231020160042.759439-1-mlombard@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 20 Oct 2023 09:01:49 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780290911036853164 X-GMAIL-MSGID: 1780290911036853164 Jump to err_out to avoid duplicating the code. Signed-off-by: Maurizio Lombardi --- drivers/base/class.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/base/class.c b/drivers/base/class.c index 05d9df90f621..7e78aee0fd6c 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c @@ -193,10 +193,8 @@ int class_register(const struct class *cls) lockdep_register_key(key); __mutex_init(&cp->mutex, "subsys mutex", key); error = kobject_set_name(&cp->subsys.kobj, "%s", cls->name); - if (error) { - kfree(cp); - return error; - } + if (error) + goto err_out; cp->subsys.kobj.kset = class_kset; cp->subsys.kobj.ktype = &class_ktype;