From patchwork Mon Jul 6 05:47:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 11644865 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DE78D60D for ; Mon, 6 Jul 2020 05:50:03 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B75AF20739 for ; Mon, 6 Jul 2020 05:50:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jDjBqpSh"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PXTgKnnj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B75AF20739 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=QQzCI/EiVBVb6i8YL262EWr8i32/f3B+gyZPfWhig9g=; b=jDjBqpShzsAeOZMKE4TV85nSN Ni3Fy8wSiAmz03BnBDbuoaTCAp4g0x5sTGgfDglwqJWnHOlbmT6lqQ7OEnrD0yQVGvYwn44i5x+rC LoU9uNh5koTJ4yORTp+KZ51fFDgji0urhdaCHudJIWaWy0eFVGEoqKcS/jz+waTF7UX6RzflKDLyq rw3Vjcg7mFF2uLvtLpdKj0/KHaX9A6cc6RSbkHg+kwKV+s06voezF7kTFOcrAUq74OufW2msdfDp4 Hyb3vTdtaFidgX8noga8VPnnOxcDgNPOkABNenJoln8fAlkfhuCq/IdsUR6KLX2JieW5ZwTlTRPOe s4ZfaMQKA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsJz7-0003Z8-KW; Mon, 06 Jul 2020 05:48:09 +0000 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120] helo=us-smtp-1.mimecast.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsJz0-0003Xj-Lu for linux-arm-kernel@lists.infradead.org; Mon, 06 Jul 2020 05:48:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594014482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=64gWJEFelnKgYAula/uoutdlAyE5+Tm44u2RP58Y9z4=; b=PXTgKnnjs5RR6akod2p7Ex53zLC+PumaZFuZcmNunGstXqjDMp0jon76c1cs4JzIg/4p7r 1e5ZpRqejaJmZ1fSmwO02nrpRtaDadvv7nGxGrAHq+xzJM/OzvzqnrQ8JjyA9jq5AK4WBw 1y6jeMN04U4HA4qPU1IYtUh1IXk0viY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-150-HTKAIRsuMOa0owh7m5W4nQ-1; Mon, 06 Jul 2020 01:48:00 -0400 X-MC-Unique: HTKAIRsuMOa0owh7m5W4nQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E0D8107B765; Mon, 6 Jul 2020 05:47:59 +0000 (UTC) Received: from localhost.localdomain.com (vpn2-54-159.bne.redhat.com [10.64.54.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DA47C0DBA; Mon, 6 Jul 2020 05:47:56 +0000 (UTC) From: Gavin Shan To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/14] drivers/firmware/sdei: Rework sdei_init() Date: Mon, 6 Jul 2020 15:47:22 +1000 Message-Id: <20200706054732.99387-5-gshan@redhat.com> In-Reply-To: <20200706054732.99387-1-gshan@redhat.com> References: <20200706054732.99387-1-gshan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=gshan@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200706_014802_837182_EBCE7878 X-CRM114-Status: GOOD ( 13.40 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [205.139.110.120 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [205.139.110.120 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, will@kernel.org, james.morse@arm.com, shan.gavin@gmail.com, catalin.marinas@arm.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This reworks sdei_init() * The function follows the steps in sequence: check ACPI existence, register platform device, register platform driver. * The corresponding error numbers are returned in failing paths. * The platform device is deleted if the driver can't be registered. Signed-off-by: Gavin Shan --- drivers/firmware/arm_sdei.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c index 35a319e7e1e6..7e7b26b1f91b 100644 --- a/drivers/firmware/arm_sdei.c +++ b/drivers/firmware/arm_sdei.c @@ -1058,7 +1058,7 @@ static bool __init sdei_present_acpi(void) acpi_status status; struct acpi_table_header *sdei_table_header; - if (acpi_disabled) + if (!IS_ENABLED(CONFIG_ACPI) || acpi_disabled) return false; status = acpi_get_table(ACPI_SIG_SDEI, 0, &sdei_table_header); @@ -1077,19 +1077,27 @@ static bool __init sdei_present_acpi(void) static int __init sdei_init(void) { - int ret = platform_driver_register(&sdei_driver); + struct platform_device *pdev; + int ret; - if (!ret && sdei_present_acpi()) { - struct platform_device *pdev; + if (!sdei_present_acpi()) + return -EPERM; - pdev = platform_device_register_simple(sdei_driver.driver.name, - 0, NULL, 0); - if (IS_ERR(pdev)) - pr_info("Failed to register ACPI:SDEI platform device %ld\n", - PTR_ERR(pdev)); + pdev = platform_device_register_simple(sdei_driver.driver.name, + 0, NULL, 0); + if (IS_ERR(pdev)) { + pr_info("Failed to register ACPI:SDEI platform device %ld\n", + PTR_ERR(pdev)); + return -ENOMEM; } - return ret; + ret = platform_driver_register(&sdei_driver); + if (ret) { + platform_device_del(pdev); + return ret; + } + + return 0; } /*