From patchwork Tue Apr 30 20:15:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 13649971 Received: from mail-oo1-f44.google.com (mail-oo1-f44.google.com [209.85.161.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0A7A199EA1 for ; Tue, 30 Apr 2024 20:18:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714508321; cv=none; b=DPqNjfmnfI0aG7A/IiHFqEFuhMIUdxmyB8CIN5KfP4Km5EIiEHcOjFvNEnlG/2P2s11cDtNuNEBUlJHy6PssVsWArqI1hP8SyMSEVymwxmULwUTDtOPkUWwiX32gUgUr7WTgtHbk9nceSs2iCfh0zBzQxc9rmN7+VxS+Zk8SD1M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714508321; c=relaxed/simple; bh=xeKJVe5IVeE08nq0bVzZyqiSZ71yZJUwZwFcGTeFYJc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=AUaKTd21I9dERa/LgeAQ9gO8QEYFib0mpcb4/iNVd+H0WMdmjg374jGyn6VzDvb8G6D6TvAkhX42DAxT5MlOj5Co20/h5mYMT+FZ3IkQCfq/TElW/GIA8np/BmaeYSmrKm1CeKgWcxjtLJo53Of8VEAztZY9RejsgfWvYHnUxSI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=hFPIqtD4; arc=none smtp.client-ip=209.85.161.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="hFPIqtD4" Received: by mail-oo1-f44.google.com with SMTP id 006d021491bc7-5aa362cc2ccso4157397eaf.3 for ; Tue, 30 Apr 2024 13:18:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1714508318; x=1715113118; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ORXndqCPX8oa0pC4YFIUBrFDkk+D8OkxD6HO3nH6Gu8=; b=hFPIqtD4idiSjibDDj3EBtEhH6adEpoWR7UHWorfH9PeLfM8Jr6zAVh/CkNisEIO38 5mlXqSLnM+YzwsAbeVFMTfidVEXwr7wJoWOQqQHCJfF7CH4xDaNHzDf/I11Js89h1F5I u449vu+NbAhIYmIqy5XEP+UlA9S/ijI/9KsdlL1Hxn8bnuVU1NktlPUhpx8rELnin3YN ZrOpVwsl0VvlrR8Cu+3HvFLTn7sjR0DLOjKOr/oHJIF/MXBQb3BzGLTnDoCHLw3xPpyQ LP1972QxmtGiFcKVGG0YAwag/Txx/BnOkEpsPu/DXsvL5lDQFrkOTC1CIFt/eTMWlbVr SU0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714508318; x=1715113118; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ORXndqCPX8oa0pC4YFIUBrFDkk+D8OkxD6HO3nH6Gu8=; b=vPiOtCYY+ScxlDfm0mf6n3mXK/H35Wedy3F4xbXOEahCfwM6y1gLH/ang5Ja4X9s2s ATuxi2AfOv4jy/EXa1gutvmjK8r1TkFAFcapG7exwQMcZwIW2POu4YuyA4lEMLnoJ8Rf 9MGqoiuA/vlfzh5Hfc8WWSc8hOAiaxWx3TgRpVUcdWhhfTRz5nbXDqX7GJTnNalWAAbd R0OQ65J7U135voHw3aoidD7137F/9OzuJa+mlEhN98p+duRUmrociS5F3eD/aILTRcrZ kXB45lbzHVYwSsgCJkz9br/1EP8GFSx4qBW5JnU3POBuJ34LyN0vh42knLdqFsfxxSiN /lFA== X-Forwarded-Encrypted: i=1; AJvYcCWb/YUpGe7kuu1QzbDzxS6NWy8T1qcfyInte0ZOtIsWsE5gnJtBgtYjLqnECsuAwXpbSpbg6p034vaU5vzBbyLy34DAay6Zcuop X-Gm-Message-State: AOJu0Yzxr7adQIl0lmuFNEO6+x8YcoAZV+1hy5aW7kuvqhwXg/HGX+cH 6qxl76YLQlsseIJ3OcttJaZVN0YwnQNAKPVlc9RpHq+ybnt1zMX/4oSjp/hAodg= X-Google-Smtp-Source: AGHT+IHnpIMnCkU79BvHJFAhHMmjnXsYZiVzIXv64GM+/siQ3GG9rzdppgmGi4XjvI1oQhg16oE3Rg== X-Received: by 2002:a4a:1701:0:b0:5aa:4d23:9114 with SMTP id 1-20020a4a1701000000b005aa4d239114mr500982ooe.3.1714508318653; Tue, 30 Apr 2024 13:18:38 -0700 (PDT) Received: from freyr.lechnology.com (ip98-183-112-25.ok.ok.cox.net. [98.183.112.25]) by smtp.gmail.com with ESMTPSA id k13-20020a4ab08d000000b005a5554a076esm5522851oon.10.2024.04.30.13.17.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 13:18:09 -0700 (PDT) From: David Lechner To: Mark Brown Cc: David Lechner , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] spi: use spi_valid_{tx,rx}buf() in stats function Date: Tue, 30 Apr 2024 15:15:27 -0500 Message-ID: <20240430201530.2138095-3-dlechner@baylibre.com> X-Mailer: git-send-email 2.43.2 Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There are macros spi_valid_txbuf() and spi_valid_rxbuf() for determining if an xfer actually intended to send or receive data. These checks were hard-coded in spi_statistics_add_transfer_stats(). We can make use of the macros instead to make the code more readable and more robust against potential future changes in case the definition of what valid means changes. The macro takes the spi_message as an argument, so we need to change spi_statistics_add_transfer_stats() to take the spi_message as an argument instead of the controller. Signed-off-by: David Lechner --- drivers/spi/spi.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) base-commit: cecfc48904cfd3d518bd4dad13c70291e6741076 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 34fca94b2b5b..a500a4137a78 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -312,7 +312,7 @@ static const struct attribute_group *spi_master_groups[] = { static void spi_statistics_add_transfer_stats(struct spi_statistics __percpu *pcpu_stats, struct spi_transfer *xfer, - struct spi_controller *ctlr) + struct spi_message *msg) { int l2len = min(fls(xfer->len), SPI_STATISTICS_HISTO_SIZE) - 1; struct spi_statistics *stats; @@ -328,11 +328,9 @@ static void spi_statistics_add_transfer_stats(struct spi_statistics __percpu *pc u64_stats_inc(&stats->transfer_bytes_histo[l2len]); u64_stats_add(&stats->bytes, xfer->len); - if ((xfer->tx_buf) && - (xfer->tx_buf != ctlr->dummy_tx)) + if (spi_valid_txbuf(msg, xfer)) u64_stats_add(&stats->bytes_tx, xfer->len); - if ((xfer->rx_buf) && - (xfer->rx_buf != ctlr->dummy_rx)) + if (spi_valid_rxbuf(msg, xfer)) u64_stats_add(&stats->bytes_rx, xfer->len); u64_stats_update_end(&stats->syncp); @@ -1618,8 +1616,8 @@ static int spi_transfer_one_message(struct spi_controller *ctlr, list_for_each_entry(xfer, &msg->transfers, transfer_list) { trace_spi_transfer_start(msg, xfer); - spi_statistics_add_transfer_stats(statm, xfer, ctlr); - spi_statistics_add_transfer_stats(stats, xfer, ctlr); + spi_statistics_add_transfer_stats(statm, xfer, msg); + spi_statistics_add_transfer_stats(stats, xfer, msg); if (!ctlr->ptp_sts_supported) { xfer->ptp_sts_word_pre = 0;