Received: by 2002:a05:7412:5112:b0:fa:6e18:a558 with SMTP id fm18csp29201rdb; Mon, 22 Jan 2024 10:51:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IE0DtbVHsLmxw9oLI2gGHqdIbALiruCDYLTpT8UeZmPeuFV8sz0FYANO/DOzQ1XTd2J2XMW X-Received: by 2002:a17:903:1c1:b0:1d7:3ad7:f24c with SMTP id e1-20020a17090301c100b001d73ad7f24cmr1886887plh.36.1705949485786; Mon, 22 Jan 2024 10:51:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705949485; cv=pass; d=google.com; s=arc-20160816; b=YJ7ingcPvWHjoq5N0TMsUwgd+c/lI+IHVE4PuKmXJ+5mS9z9DW8hKoC04h94dx6WCh WtlOERHH+mI0id61GoE1Oa23TuVmWYicmiVsZtKWr0x0aY7FaL9P5aK3lpxco8ie1Nwv jSuG4pLSOr7bXHd+pjeiq3QRH0OCTHaUmlLVoBvh+XgjSwpf5pKT36PLrTPrIQJr8yS4 YpdrbSNgalK9VHA91ra3yjwclHxZyvyuUgk5kSpWxOTkg78O6J8a3hUBYHMDNEh/+umg OWz08D2w6vXrRAmqHASFePVci1AVHYKYbia5frrKII8SXenHzsMr5zQscPPWOIa8IHX/ m/gg== 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:references:in-reply-to:message-id :date:subject:cc:to:from; bh=XO8jbY7jMvqDs+1FuhtEgwxmssiTngjUnFzYyYkICOk=; fh=j29YcDCJbE+QZxAFMzPO3WkrRep2oyKEXfH6cz8W+HI=; b=p1EVv659tST2qrI0pB65Qj59bpq4G96bJYxX/OzUaomYcFP80vOAK+5qkwwUz94eJV N+mAtgelckmDdYg0pwpo81kekU+sDDHAwO9kr6VKBcxHqspWCF+0lwq2dzHooRBCQJUZ cZ3Qv+a5MIuSPDunqlUbpv6ve5zs5ZibiIzmvKcmFqJMKsHSS0G0y8QxV0lnOvkr5jTp CRuD58sedE1c/rNKTouI1E+AFtnYJ7XFfJQCQuLrpobrZGWm1NwznRBrg8fCxHgwDle7 AAuOt0JqzVYkgokMMad52EdYdr3QwimYrono4p5eSFyqiIAEQA89rXIEyk3Dwn0eG6bh YuQQ== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-33933-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33933-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id z9-20020a170903018900b001d5a008e4efsi8616811plg.157.2024.01.22.10.51.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 10:51:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-33933-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-33933-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33933-linux.lists.archive=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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 012062889C3 for ; Mon, 22 Jan 2024 18:41:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3F203627FA; Mon, 22 Jan 2024 18:08:35 +0000 (UTC) Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 881F060DF2 for ; Mon, 22 Jan 2024 18:08:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705946914; cv=none; b=g97yXGYIquxta/PI6mFaZY8FEjSLHTuVHL2XVvgQO0eFLqW0lkQzqhnRbpJcCsplABwE6Eh85x5GWE86OV8TOkyiqQV6G7ogJqTSBXJgXkP7W2jBkV3cbiGFVBUN8MKf80cIZTFEB3YxnknvoCsS+y3WoCb6I7s5w2JFxb8fW9k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705946914; c=relaxed/simple; bh=8drcgdb3m/yT4iPvJGL3OsM8domsXf3+QeiZTDg4ie0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uGuZgEH71TvhbYCIcxP+w8jbwRKt/sQTyUeIXhLlqS5q885Mu4iFxk+pBIaomqX6rMwmkYTGWsQMJkU1lkzEahlmBHUfgY1uSegcd5S6iGBRTca1RlKW/8dCzfirl7168VnHBLribjPA2EQv4Lqja3hRCMwTmlOmjyRisqCmwvY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rRyiV-0001lg-HG; Mon, 22 Jan 2024 19:08:15 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rRyiT-001ePU-MB; Mon, 22 Jan 2024 19:08:13 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rRyiT-005Zx3-1w; Mon, 22 Jan 2024 19:08:13 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Dmitry Torokhov , Ulf Hansson , Rayyan Ansari , Andy Shevchenko , Jonathan Cameron , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Subject: [PATCH v2 05/33] Input: synaptics-rmi4 - follow renaming of SPI "master" to "controller" Date: Mon, 22 Jan 2024 19:07:00 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1054; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=8drcgdb3m/yT4iPvJGL3OsM8domsXf3+QeiZTDg4ie0=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlrq7IUbynclwAXQvEaL/CG4Lh7UWDH5qA1DZQ7 6tqvqZk2feJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZa6uyAAKCRCPgPtYfRL+ Tt51B/4uJxNpLR4s72YJFagumenuXQIHLuy74DdFvoURweuBaSRJj7E5IwTE59HFW6PlBG5jPNS RI9a9DIHj1bHFzTeOGCw+F1Nok0uxbljEvT+vl5RdlUOCgWjdMCvQmJZveofQlCHtY4FfBvwUzJ Ddx7FzUO6e+5TsDYA8B3vnEp453ZT8D43ITCOKXqLLwQvAyLWs3escllTBH+lqek+mFOWHlzF4n lMWLa8ps4ucmro75obZJne2gAOkW1eoj6kNRc2krJjrTZFLoxmQHu9Kv3VpAsl/k0bUWvMAxwtY TJ7grt5Y1m3z0nAwMxQ/l9RX8ni8RHI8b8+XtODGBw/x0Sqx X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org In commit 8caab75fd2c2 ("spi: Generalize SPI "master" to "controller"") some functions and struct members were renamed. To not break all drivers compatibility macros were provided. To be able to remove these compatibility macros push the renaming into this driver. Acked-by: Dmitry Torokhov Signed-off-by: Uwe Kleine-König --- drivers/input/rmi4/rmi_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/rmi4/rmi_spi.c b/drivers/input/rmi4/rmi_spi.c index 07c866f42296..9d92129aa432 100644 --- a/drivers/input/rmi4/rmi_spi.c +++ b/drivers/input/rmi4/rmi_spi.c @@ -375,7 +375,7 @@ static int rmi_spi_probe(struct spi_device *spi) struct rmi_device_platform_data *spi_pdata = spi->dev.platform_data; int error; - if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX) + if (spi->controller->flags & SPI_CONTROLLER_HALF_DUPLEX) return -EINVAL; rmi_spi = devm_kzalloc(&spi->dev, sizeof(struct rmi_spi_xport), -- 2.43.0