From patchwork Tue May 10 22:22:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 9063511 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 17898BF29F for ; Tue, 10 May 2016 22:22:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5104C20172 for ; Tue, 10 May 2016 22:22:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 808B020138 for ; Tue, 10 May 2016 22:22:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 587466E21F; Tue, 10 May 2016 22:22:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x242.google.com (mail-qk0-x242.google.com [IPv6:2607:f8b0:400d:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id F17406E21F for ; Tue, 10 May 2016 22:22:41 +0000 (UTC) Received: by mail-qk0-x242.google.com with SMTP id l68so1783657qkf.3 for ; Tue, 10 May 2016 15:22:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=ZUYJ4YvrSQXkmhT+ybH393zh5PWRCLndpp2PGa9BmSM=; b=j70OWe1HcHi++hLNP6yWOsEoDlRLbVxps5OR0ROuvEDkhKOIYHK+6zK/AlXCjnpI5l IwMuW8ki18XF/mfq0qUbDbGBghxLed0qC39HpogQG6E5my/z4xQS+m8oDW4kiMytvYke cAr6GGlWqlDZXriMlb8GP6bNthb8V3Romlp5ZoaAOCBZpVydMG0oyPV4JL2NGnmLc+kx DC87ZuAplCUV6vRMMRwoj8gCPR0cINTZCCPa1jjTTRf1phjDWGTRCxlfvBzl1Kuo0ybe QRoQixmlgihkjDshdftZGoe8MQvCv1rYezINi2XhilhJI29jKjti/tcWNRv9hWETgqyX UD/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZUYJ4YvrSQXkmhT+ybH393zh5PWRCLndpp2PGa9BmSM=; b=jqALj9j93AeRV+gesvCrDX6PrAkq442DLKGOBpuF/1gt1jeudwcL7Uk9bIGc58/jjE Z/gubdLNc2H9t9Nm1JHqe+Hq7fJs9woFW3VrSq9UK/WhGshCaUNG8bfJxC+DeL5P+Zim w5+h2GMVB2cjAvrZUwsQIisj/FfZhTU5HzVOu+VvLDed/iYUA+NIYuiJZmRKVq+Ofl13 O1N2wPxIta+ciZUVO563XTQyWGfOyFakGTsgXgSUD1l3er9kGRiNXk0momIegkXdBAqc k0CWhnIUFa93PqBEJvHtLockwTVmjk8DvcGIO4taNTxiSQgtyjcH4fgWwrOdMtB+b3jx FAPg== X-Gm-Message-State: AOPr4FVtIb0OBizmAmNLCS/iwPkf7GH0sr2gxEj/zoPI9r2jvvr1l8ps7ZYgcBvaQDrACg== X-Received: by 10.55.80.86 with SMTP id e83mr46723828qkb.91.1462918960965; Tue, 10 May 2016 15:22:40 -0700 (PDT) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id g34sm1992532qge.20.2016.05.10.15.22.40 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 May 2016 15:22:40 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/amd/powerplay: rewrite pp_sw_init to make code readable Date: Tue, 10 May 2016 18:22:32 -0400 Message-Id: <1462918952-21719-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 Cc: Alex Deucher , Huang Rui X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-6.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Huang Rui Actually, pp_sw_init executes pptable_init and backend_init orderly if they are initialized successfully. So rewrite it to make code more readable. Reviewed-by: Alex Deucher Signed-off-by: Huang Rui Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c index 9f2d4069..8e345bf 100644 --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c @@ -68,15 +68,18 @@ static int pp_sw_init(void *handle) return -EINVAL; ret = hwmgr->pptable_func->pptable_init(hwmgr); + if (ret) + goto err; - if (ret == 0) - ret = hwmgr->hwmgr_func->backend_init(hwmgr); - + ret = hwmgr->hwmgr_func->backend_init(hwmgr); if (ret) - printk(KERN_ERR "amdgpu: powerplay initialization failed\n"); - else - printk(KERN_INFO "amdgpu: powerplay initialized\n"); + goto err; + pr_info("amdgpu: powerplay initialized\n"); + + return 0; +err: + pr_err("amdgpu: powerplay initialization failed\n"); return ret; }