From patchwork Tue Jan 23 21:49:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 191206 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp623422dyi; Tue, 23 Jan 2024 13:50:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IGVEfgoRMx3ZPbnfjjQHw+DuSmzn6ZjaYQHgg4fuIjNhZ4y9uFQeqWgcjfbNcRSVXjCe5zW X-Received: by 2002:a05:6402:35c7:b0:55c:7079:fed7 with SMTP id z7-20020a05640235c700b0055c7079fed7mr1726820edc.11.1706046655054; Tue, 23 Jan 2024 13:50:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706046655; cv=pass; d=google.com; s=arc-20160816; b=FaPFp2o/9tjQxOcnmo+42EAO5wpNAzKatfjA78X2r6WEIjdzXWisq0zDhu1An28Mxu J2O4XCZCImksyf7zbM0s60Y3cHW1ZBFEAYV1plwjCScXdYdGzvocZMCkpCVcylWqMTti iQ0qtJRFhvi52uUvvKLu3WAup5tkjy1u1r8AtYicFQ9fD53tE1uJIjoI9ww8xur/uFsT kTk6ii8ZEAj38NRTvwQtKAuvyWqKE6PawBqio2FcBHZspH/WmkiCdyI7urzTza3ftPZA IKUobSIl+V5K9C6124EyFyvit+WOHXlpcl8QQi+qUeAp1lpOpsBxCJkirYIwt3NTKgOv OYSw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=2KeetDUGZXNfbQyMYC9x9HpMR6XYRC4AqSuY7y18XGE=; fh=dqYTSFdLMwlyF6rXo3vkKqKjRNgcDx+84rGMVUgvgFY=; b=mDZt33qHngUkLB5qnQqEVYcfOXGVEiFxdN9KPr1it+/aWQa/nudYefU+Oh803Cm4Rh pBMldjQCBlbsiBIzn5TC0tvPIskQpdJR27Uf+XoQYjbaOrJvyNEerUTYXDB6OhhrwWu1 +Ri5NhMpZzT+4fHDmsQ2CoSaksMScfzdnr16HRbO88NhOYAoCG0nwiADM+ZiA5yUBWUG aA351r1d1FY6FNZ4IWGNYfePimqqqeYpmDtpyj+QQSX8uxzjncmvyrdtp/YAOm1vISc1 VCsePxnP64K16Rz9KvzK/+Bcg/BEAOdaiN91/NBzFhqBksrDwfGNK48oYVDs3n5ZgvSj uopg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b="0ZO0/zTn"; arc=pass (i=1 spf=pass spfdomain=baylibre.com dkim=pass dkdomain=baylibre-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-36089-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36089-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id fk3-20020a056402398300b0055a90095457si4056934edb.385.2024.01.23.13.50.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 13:50:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-36089-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b="0ZO0/zTn"; arc=pass (i=1 spf=pass spfdomain=baylibre.com dkim=pass dkdomain=baylibre-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-36089-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36089-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id ABB7A1F2585D for ; Tue, 23 Jan 2024 21:50:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E9A7D495E4; Tue, 23 Jan 2024 21:50:41 +0000 (UTC) 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="0ZO0/zTn" Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) (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 14ADC2114 for ; Tue, 23 Jan 2024 21:50:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706046639; cv=none; b=erNYnfKgaXCumYJhNUqgH5SEHqW0QY+vrfpQzHxhzT09WP1GkZIG8iy3KAX/1kPnKHLVeFcSX+83Aejvipi82+jCzblBDyw7qulyjTM3iSUjinVkOdVXQSSPY4e75BZ30RNr89IPngXv103VpfOFYZhovB92Hy1V6AMniIwTFQw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706046639; c=relaxed/simple; bh=qjSzwxfvEw8P0/KSwYPerGQtyn2kLF/crHyHSJzwEIA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=m166LQUd93BxpkIaxb8gMsycrmRUxlgiBAAIaOLv+hhEEs0diKg56kviBurhEZu8QOKAdssKjeLhudX4EpMCtyTLlafPidA7iYDs6SF+uUz6gnGgq4aU9vrs2xNBtuywj6XPTqErLmMSIsAD/WSJWPhNr5j0li/8hEMHi7beHhc= 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=0ZO0/zTn; arc=none smtp.client-ip=209.85.167.172 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 Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3bb53e20a43so3448214b6e.1 for ; Tue, 23 Jan 2024 13:50:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1706046635; x=1706651435; 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=2KeetDUGZXNfbQyMYC9x9HpMR6XYRC4AqSuY7y18XGE=; b=0ZO0/zTnoiUqti6H++caZPk2HudH5pLUulXRCkqzyccnnI/erSJOFdO8FN1YwSz85J JE+M6Tu+v4LWqY3qgzdtXoZazPGKlS4Mj6YUhLHLZE9/YTD/2kMc939R4+Zlhd5nfCly 2y6VpifJa7BrctggaqyKhKhWqDgZZIUw295X5gk5a0lsmQ4tvYfk44XQxnZtMhzSqW/h Zoc7HV07eFzS0n7OzCKKASdjDPnrmr0CcipMsoeOPyDQdV+M2Z30urz7JCw4rt+i0L4o rykLFgeMPECipQBJkt6I3o1bDL2dtbwssN/i8iVNo2G2p81yF0UTlBCI7Mu40DRFEgvR 60Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706046635; x=1706651435; 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=2KeetDUGZXNfbQyMYC9x9HpMR6XYRC4AqSuY7y18XGE=; b=UDJpMG7yJlbOzzfJOdgmCBgoCgUvWOiazIBhUnR/+IwiJbS2E3DRVKkvkX07KaoLeZ eV9mj6dnPnd4uHBiVr9Ipn5kfIIEdooweoJJhFWjY5DY1Xl1KgC0oPHSey5iyYY0CqjG 7S/HH++AhpEXUtk6VTn4x/eNWQWtgkWPf5oALeCQx/wFTwAXrhpePXROcT+9HL9YV2JX Gb7mRTFeJ6LzUCIv1PyyHatww+SlvHSjfGQusb1NoyebqT8E1fBhsYA3Zen+BL/ZSHyV EckaFbnBItooOmkd8irsouhnrgh/rZZ+WObt4RkCsnApY/CeuLfWJZBRtWxXSgXWzVPD CCyQ== X-Gm-Message-State: AOJu0YwYVgoJ2wPjliuUUnTzp9ad1Ml+/uyjswrBHBGdoxQ791UkHim2 FiDO8wcWFRZqAI0WSGYBCnW1GCIdzwXOrvL1UCz+E0WOwqgG6SaWlBzp+jWTVeU= X-Received: by 2002:a05:6808:1496:b0:3bd:cdc3:ad4 with SMTP id e22-20020a056808149600b003bdcdc30ad4mr389626oiw.15.1706046635145; Tue, 23 Jan 2024 13:50:35 -0800 (PST) Received: from freyr.lechnology.com (ip98-183-112-25.ok.ok.cox.net. [98.183.112.25]) by smtp.gmail.com with ESMTPSA id k10-20020a056808068a00b003bda3125e3csm1956290oig.48.2024.01.23.13.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 13:50:34 -0800 (PST) From: David Lechner To: Mark Brown Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, David Lechner Subject: [PATCH] spi: consolidate setting message->spi Date: Tue, 23 Jan 2024 15:49:46 -0600 Message-ID: <20240123214946.2616786-1-dlechner@baylibre.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788919577665844810 X-GMAIL-MSGID: 1788919577665844810 Previously, __spi_sync() and __spi_async() set message->spi to the spi device independently after calling __spi_validate(). __spi_validate() also would conditionally set this if it needed to split the message since it wasn't set yet. Since both __spi_sync() and __spi_async() call __spi_validate(), we can consolidate this into only setting message->spi once (unconditionally) in __spi_validate(). This will also save any future callers of __spi_validate() from also needing to set message->spi. Signed-off-by: David Lechner --- drivers/spi/spi.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index bc3d7c0ce6b4..7a70ef47cdf6 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -4059,6 +4059,8 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message) if (list_empty(&message->transfers)) return -EINVAL; + message->spi = spi; + /* * If an SPI controller does not support toggling the CS line on each * transfer (indicated by the SPI_CS_WORD flag) or we are using a GPIO @@ -4071,9 +4073,6 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message) size_t maxsize = BITS_TO_BYTES(spi->bits_per_word); int ret; - /* spi_split_transfers_maxsize() requires message->spi */ - message->spi = spi; - ret = spi_split_transfers_maxsize(ctlr, message, maxsize, GFP_KERNEL); if (ret) @@ -4210,8 +4209,6 @@ static int __spi_async(struct spi_device *spi, struct spi_message *message) if (!ctlr->transfer) return -ENOTSUPP; - message->spi = spi; - SPI_STATISTICS_INCREMENT_FIELD(ctlr->pcpu_statistics, spi_async); SPI_STATISTICS_INCREMENT_FIELD(spi->pcpu_statistics, spi_async); @@ -4391,8 +4388,6 @@ static int __spi_sync(struct spi_device *spi, struct spi_message *message) if (status != 0) return status; - message->spi = spi; - SPI_STATISTICS_INCREMENT_FIELD(ctlr->pcpu_statistics, spi_sync); SPI_STATISTICS_INCREMENT_FIELD(spi->pcpu_statistics, spi_sync);