From patchwork Fri Nov 16 18:42:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10686779 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ACECB1747 for ; Fri, 16 Nov 2018 18:42:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A07992D834 for ; Fri, 16 Nov 2018 18:42:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 951CF2D842; Fri, 16 Nov 2018 18:42:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, TVD_SUBJ_WIPE_DEBT autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25B2E2D83C for ; Fri, 16 Nov 2018 18:42:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390427AbeKQE4S (ORCPT ); Fri, 16 Nov 2018 23:56:18 -0500 Received: from mail-yb1-f193.google.com ([209.85.219.193]:39147 "EHLO mail-yb1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390426AbeKQE4R (ORCPT ); Fri, 16 Nov 2018 23:56:17 -0500 Received: by mail-yb1-f193.google.com with SMTP id w17-v6so10136049ybl.6 for ; Fri, 16 Nov 2018 10:42:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o2LYDIsWZ4YfMBmdGLCbQke/Hq7j/ytpMZOA7i7vg2k=; b=bBlqesEItwBTAVpfGxjB3Mj7kdwhORmuft9J/bSBhQ2af7YfcI3CnUOj+D4KXb1iIC IEDeqXpEM34prdJ0O6ldITuBtI6dl5urUJ6uzgase6NLYAVFjhJcnlbOIAiG9U+iFyle y3mi0NMGU5gO13mEwlW0kjvld5N1RpDXLc7xqTaYBMCAJ60jlTQfNM7gRr6cJdamoemh 7czCbf5clQ3Li+N7Fb2sud1fB6iik9ZZY9XXswj3XZEX2bImNnG1gFJUI/AJnN7P6vDO Or+kyYZy219ce8/dQRZt4mqjHryzqIRXE3xCn/Z2LBYgg94/nfS9TiBD8JgdwL9kdhSA 5CVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o2LYDIsWZ4YfMBmdGLCbQke/Hq7j/ytpMZOA7i7vg2k=; b=QSesLAtYyN9paaHXbIjR01OZJvLhtHcHp2u3DU/xK6U0GqaqEM0dL6ZUhqJbrfzJg8 2Fa+GX7Aa004R4BRb+pDbxE5U9d7WjTQML43iZzQgwNxg8/5ZWQSyT0ZHv74SMUHBBxZ ip//aA39YfQ9aywQeGp9oTHkZYRMFLShTqxB4+vs48451HSWxy/nmE08euwcsHLTX+g0 txBeq4d12TEOE/dhR+BkCfVqJt10cR7tZLiH4sIIz9oVX8XFzj8hmw6Pm5U6tjwBHIBr EjBZV9RxfxvCJBj6w7h7+RpOHxjr/BhUMlk7g20e1BNCdy4sw2uqgxgPxlAwjvmOq/ss zJww== X-Gm-Message-State: AGRZ1gIaopV6XWgb3cnxysCsEgOKzVzYBFUjfWstNnfJBKbChjPYYQYt +WmU1mnMWyKxGBenOqvEEqJooA== X-Google-Smtp-Source: AJdET5cDgL5iH7Yuih+CY/HYbjltGxYfEYip0JoyT4uuMoUazbGx8Dfz5eMX1rjFyeNFgQdFuoiQ6g== X-Received: by 2002:a25:6344:: with SMTP id x65-v6mr11110358ybb.163.1542393765489; Fri, 16 Nov 2018 10:42:45 -0800 (PST) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:ad55:b1db:adfe:3b9f]) by smtp.gmail.com with ESMTPSA id b144sm5359134ywa.33.2018.11.16.10.42.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Nov 2018 10:42:45 -0800 (PST) From: Sean Paul To: dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org Cc: robdclark@gmail.com, jsanka@codeaurora.org, Sean Paul Subject: [PATCH v2 01/24] drm/msm: dpu: Remove dpu_power_handle_get_dbus_name() Date: Fri, 16 Nov 2018 13:42:11 -0500 Message-Id: <20181116184238.170034-2-sean@poorly.run> X-Mailer: git-send-email 2.19.1.1215.g8438c0b245-goog In-Reply-To: <20181116184238.170034-1-sean@poorly.run> References: <20181116184238.170034-1-sean@poorly.run> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sean Paul It's only used for debugfs, so just output the enum value instead. Changes in v2: - None Reviewed-by: Jeykumar Sankaran Signed-off-by: Sean Paul --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 6 ++---- drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c | 14 -------------- drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h | 7 ------- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index ed84cf44a222..e09209d6c469 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -1381,11 +1381,9 @@ static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v) dpu_crtc->cur_perf.core_clk_rate); for (i = DPU_POWER_HANDLE_DBUS_ID_MNOC; i < DPU_POWER_HANDLE_DBUS_ID_MAX; i++) { - seq_printf(s, "bw_ctl[%s]: %llu\n", - dpu_power_handle_get_dbus_name(i), + seq_printf(s, "bw_ctl[%d]: %llu\n", i, dpu_crtc->cur_perf.bw_ctl[i]); - seq_printf(s, "max_per_pipe_ib[%s]: %llu\n", - dpu_power_handle_get_dbus_name(i), + seq_printf(s, "max_per_pipe_ib[%d]: %llu\n", i, dpu_crtc->cur_perf.max_per_pipe_ib[i]); } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c index fc14116789f2..8c6f92aaaf87 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c @@ -24,20 +24,6 @@ #include "dpu_power_handle.h" #include "dpu_trace.h" -static const char *data_bus_name[DPU_POWER_HANDLE_DBUS_ID_MAX] = { - [DPU_POWER_HANDLE_DBUS_ID_MNOC] = "qcom,dpu-data-bus", - [DPU_POWER_HANDLE_DBUS_ID_LLCC] = "qcom,dpu-llcc-bus", - [DPU_POWER_HANDLE_DBUS_ID_EBI] = "qcom,dpu-ebi-bus", -}; - -const char *dpu_power_handle_get_dbus_name(u32 bus_id) -{ - if (bus_id < DPU_POWER_HANDLE_DBUS_ID_MAX) - return data_bus_name[bus_id]; - - return NULL; -} - static void dpu_power_event_trigger_locked(struct dpu_power_handle *phandle, u32 event_type) { diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h index a65b7a297f21..f627ae28ec68 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h @@ -207,11 +207,4 @@ struct dpu_power_event *dpu_power_handle_register_event( void dpu_power_handle_unregister_event(struct dpu_power_handle *phandle, struct dpu_power_event *event); -/** - * dpu_power_handle_get_dbus_name - get name of given data bus identifier - * @bus_id: data bus identifier - * Return: Pointer to name string if success; NULL otherwise - */ -const char *dpu_power_handle_get_dbus_name(u32 bus_id); - #endif /* _DPU_POWER_HANDLE_H_ */