From patchwork Thu Jul 8 18:08:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 471279 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp526064jao; Thu, 8 Jul 2021 11:09:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxod1FxrQvlby3VW73t40mwo4tXnL/UIkB6+8vlk789KwhnKlgjC13hp70eE+dEpgYPcgjH X-Received: by 2002:a17:906:a391:: with SMTP id k17mr992166ejz.516.1625767754553; Thu, 08 Jul 2021 11:09:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625767754; cv=none; d=google.com; s=arc-20160816; b=KcsSXOSuIDyrBc0LlGvqw1Mk1iZ8OLN9nIOUE+PA4A1uYQbcn+/0K/lpBE4bncFbwr I7E29oroSQHW07zDSoEE8qZNtfuTVXJXZh24RPFD9NJMydWiM6rTeGYZEglbnre1XWwu IzAcnIJnf9ABNVqwJbxUtRcI7qpjpyU1bGuQj1QrKyk8oXcolHNuiGKRSvjWGhVRL7E6 wZsWSdO4YyJejqXMY6b7eUfShb7pUQaJIgcvMo29bD9CTupn00qrBpeyXcqYiAAEqRBO vHIQQ725f+vvQvFEhiMoUZHmN/b4rU6XlRYBArWgFV9QbcslFMqFhuRk9D/bLayJpG+E Q7Ng== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=CClQ+dh87CJ0TfJyXP0dlxsbaNUljhQhfIIFPApNnT4=; b=n4wzm5y8He4LfOdZYVsIemwroc2AEGIjsDeZJy972Unw3blND4jJLNS4y91QTsOdoy S4TH3c6LD/w4iXGtTXM974v7ZelFUPN562hX8pARWF9Rcaz14HOS+li+vMkNf85L/2Q+ aEQxjvmCqJbUH5i4cMcn68oj6eFItYFlhADA9FKu7fKoQZmlbovhE6CSEiMOrA0ZrN9o /zuvDs4JdZyjSvh/gAhq7jd+1rVh58XxciGMRX1ckYCMJbKbpPoF/gtc0szoyMghgkd2 dv8ZnNSJiQPb8b4ecyXesxP/w8sDK7FDbZtB5lvPraXkFOSuWLRTpQxC2VsCt2/NIqBz Q2YQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y7si3810568ejc.395.2021.07.08.11.09.14; Thu, 08 Jul 2021 11:09:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-acpi-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-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230299AbhGHSLz (ORCPT + 4 others); Thu, 8 Jul 2021 14:11:55 -0400 Received: from foss.arm.com ([217.140.110.172]:36026 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230347AbhGHSLx (ORCPT ); Thu, 8 Jul 2021 14:11:53 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 97580D6E; Thu, 8 Jul 2021 11:09:11 -0700 (PDT) Received: from usa.arm.com (e103737-lin.cambridge.arm.com [10.1.197.49]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B1A083F66F; Thu, 8 Jul 2021 11:09:10 -0700 (PDT) From: Sudeep Holla To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Cristian Marussi , "Rafael J . Wysocki" , Jassi Brar Subject: [PATCH 11/13] mailbox: pcc: Drop handling invalid bit-width in {read, write}_register Date: Thu, 8 Jul 2021 19:08:49 +0100 Message-Id: <20210708180851.2311192-12-sudeep.holla@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210708180851.2311192-1-sudeep.holla@arm.com> References: <20210708180851.2311192-1-sudeep.holla@arm.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org pcc_chan_reg_init now checks if the register bit width is within the list [8, 16, 32, 64] and flags error if that is not the case. Therefore there is no need to handling invalid bit-width in both read_register and write_register. We can drop that along with the return values for these 2 functions. Signed-off-by: Sudeep Holla --- drivers/mailbox/pcc.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) -- 2.25.1 diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index 237dba9cb445..99ad3429f174 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -110,10 +110,8 @@ static struct mbox_controller pcc_mbox_ctrl = {}; * The below read_register and write_registers are used to read and * write from perf critical registers such as PCC doorbell register */ -static int read_register(void __iomem *vaddr, u64 *val, unsigned int bit_width) +static void read_register(void __iomem *vaddr, u64 *val, unsigned int bit_width) { - int ret_val = 0; - switch (bit_width) { case 8: *val = readb(vaddr); @@ -127,19 +125,11 @@ static int read_register(void __iomem *vaddr, u64 *val, unsigned int bit_width) case 64: *val = readq(vaddr); break; - default: - pr_debug("Error: Cannot read register of %u bit width", - bit_width); - ret_val = -EFAULT; - break; } - return ret_val; } -static int write_register(void __iomem *vaddr, u64 val, unsigned int bit_width) +static void write_register(void __iomem *vaddr, u64 val, unsigned int bit_width) { - int ret_val = 0; - switch (bit_width) { case 8: writeb(val, vaddr); @@ -153,13 +143,7 @@ static int write_register(void __iomem *vaddr, u64 val, unsigned int bit_width) case 64: writeq(val, vaddr); break; - default: - pr_debug("Error: Cannot write register of %u bit width", - bit_width); - ret_val = -EFAULT; - break; } - return ret_val; } static int pcc_chan_reg_read(struct pcc_chan_reg *reg, u64 *val) @@ -172,7 +156,7 @@ static int pcc_chan_reg_read(struct pcc_chan_reg *reg, u64 *val) } if (reg->vaddr) - ret = read_register(reg->vaddr, val, reg->gas->bit_width); + read_register(reg->vaddr, val, reg->gas->bit_width); else ret = acpi_read(val, reg->gas); @@ -187,7 +171,7 @@ static int pcc_chan_reg_write(struct pcc_chan_reg *reg, u64 val) return 0; if (reg->vaddr) - ret = write_register(reg->vaddr, val, reg->gas->bit_width); + write_register(reg->vaddr, val, reg->gas->bit_width); else ret = acpi_write(val, reg->gas);