Received: by 2002:a25:1104:0:0:0:0:0 with SMTP id 4csp994349ybr; Sat, 23 May 2020 03:44:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiLdVI6JREJwz5QsGxkKBAefaxgJUF4ugomxXoUaNRpLXxAXorqvh6vY6dflv3y7kCAGx2 X-Received: by 2002:a17:906:70d:: with SMTP id y13mr10980900ejb.99.1590230666415; Sat, 23 May 2020 03:44:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590230666; cv=none; d=google.com; s=arc-20160816; b=xZNoGGG3kdr2FP8rLR7AHw+Lv4s0zEQhTS+YOJ5/0m/PBjimJKkvqJbIjNUIcHgeQe eW8scCrv/uDNISfx6aGCFnQ27MB7Z0yYIFHn4/UVKZiiKauC9abdrPNbCf8trBJq1p5H Mk3LItwR6Iebsetz97pdkSiJMeMAhLWqIgA6lhq57Qo5eI5YYdQox5vUAGP+qFyKNDCG pN1u8gxkjAuuC9Mp5+bJ8Z0Uu2A8sKwxPAHUmpFetUCnnedu16jiyIH6EiUV0iqxPPBK OeWsM7H0R17qULkQ4auFj6yH1dxFvjQzGjPRSNQYPfwUnkggFeV0NsBmkAcTaIN4hAXT g1Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ZElhRVhYsEZa00+Fl2R0BDrwO0eFz3Dmr6hS24fJMJQ=; b=iW0j5KH/6sFwUhd89xQa/KO6hAleN5TZYEYNcvej+0gAadt1pcZgGGsltifF4jZ2fx VNbJ8En0DqDr8tdw+cgvaWcOugPpSVFvhEYOaGMWsVLbRD6kFM98WzdAe2+fldwjRjim 7htdcKl3s55YG69gFVTLNbh/ZATqOTd0ZdYmEGoUWna6ldzVE6y7U2gzSwOlJ2CAAjHO gOAnf1vXv9iAmIdtLpTlmWnNUkBf6KohRSSpKkSweRYSi6D4yuezJYPh4chv3SHGOsbR 0QwPzZGZowpDRt2RJ74/NGMfC8316ZyHVn+Fu/JjxEiHrZMZkLG7LDQeXA52FMzJXZJh doUw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t10si6145679ejr.589.2020.05.23.03.44.04; Sat, 23 May 2020 03:44:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731262AbgEWKlx (ORCPT + 99 others); Sat, 23 May 2020 06:41:53 -0400 Received: from v6.sk ([167.172.42.174]:40060 "EHLO v6.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731237AbgEWKlu (ORCPT ); Sat, 23 May 2020 06:41:50 -0400 Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id 3B60461300; Sat, 23 May 2020 10:41:49 +0000 (UTC) From: Lubomir Rintel To: Lucas Stach Cc: Russell King , Christian Gmeiner , etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH v2 4/4] drm/etnaviv: Simplify clock enable/disable Date: Sat, 23 May 2020 12:41:37 +0200 Message-Id: <20200523104137.12562-5-lkundrak@v3.sk> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200523104137.12562-1-lkundrak@v3.sk> References: <20200523104137.12562-1-lkundrak@v3.sk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All the NULL checks are pointless, clk_*() routines already deal with NULL just fine. Signed-off-by: Lubomir Rintel --- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 53 ++++++++++----------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 798fdbc8ecdb..fb37787449bb 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -1487,55 +1487,40 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu) { int ret; - if (gpu->clk_reg) { - ret = clk_prepare_enable(gpu->clk_reg); - if (ret) - return ret; - } + ret = clk_prepare_enable(gpu->clk_reg); + if (ret) + return ret; - if (gpu->clk_bus) { - ret = clk_prepare_enable(gpu->clk_bus); - if (ret) - goto disable_clk_reg; - } + ret = clk_prepare_enable(gpu->clk_bus); + if (ret) + goto disable_clk_reg; - if (gpu->clk_core) { - ret = clk_prepare_enable(gpu->clk_core); - if (ret) - goto disable_clk_bus; - } + ret = clk_prepare_enable(gpu->clk_core); + if (ret) + goto disable_clk_bus; - if (gpu->clk_shader) { - ret = clk_prepare_enable(gpu->clk_shader); - if (ret) - goto disable_clk_core; - } + ret = clk_prepare_enable(gpu->clk_shader); + if (ret) + goto disable_clk_core; return 0; disable_clk_core: - if (gpu->clk_core) - clk_disable_unprepare(gpu->clk_core); + clk_disable_unprepare(gpu->clk_core); disable_clk_bus: - if (gpu->clk_bus) - clk_disable_unprepare(gpu->clk_bus); + clk_disable_unprepare(gpu->clk_bus); disable_clk_reg: - if (gpu->clk_reg) - clk_disable_unprepare(gpu->clk_reg); + clk_disable_unprepare(gpu->clk_reg); return ret; } static int etnaviv_gpu_clk_disable(struct etnaviv_gpu *gpu) { - if (gpu->clk_shader) - clk_disable_unprepare(gpu->clk_shader); - if (gpu->clk_core) - clk_disable_unprepare(gpu->clk_core); - if (gpu->clk_bus) - clk_disable_unprepare(gpu->clk_bus); - if (gpu->clk_reg) - clk_disable_unprepare(gpu->clk_reg); + clk_disable_unprepare(gpu->clk_shader); + clk_disable_unprepare(gpu->clk_core); + clk_disable_unprepare(gpu->clk_bus); + clk_disable_unprepare(gpu->clk_reg); return 0; } -- 2.26.2