From patchwork Wed Feb 7 18:40:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 198042 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2434231dyb; Wed, 7 Feb 2024 10:46:54 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVcHXDfFvoGM1RlU9EDFaCJtn6qpQBUsQRqZXTflFcC160HwPUuZvYZ2Tos1pTkPAl+QxwSrtP+P7p+T8VqEE81nX7pSw== X-Google-Smtp-Source: AGHT+IHuUIivzigrXgoXZ5UoqQfKTLF3cX4EzP8BSeVKxHm6DdMCgWr1bzcXSJxEpt1pNKditqzB X-Received: by 2002:a17:906:32cd:b0:a36:6f2f:7628 with SMTP id k13-20020a17090632cd00b00a366f2f7628mr334603ejk.2.1707331614643; Wed, 07 Feb 2024 10:46:54 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707331614; cv=pass; d=google.com; s=arc-20160816; b=Tb0wcyj/P+ykE0BOOljS8qCy3FAApY2DLRB5+HeJ2AqzfCSyMhJGk1n4KomyWXi0Rq OCZH8oxodyKnwdefajN6Qz/ATvP9cYYu5VRIdQmDLvyjIi9h/1IxK1wMWAmNMEu9f9Ik ezcQcpBj4fm5a4trYSXGfBoF2vc0azwN5kc2RTWcGUPnXcZt8/xGOCxk2rJR4xafWWqp LZ+uJ88v7Nku5xOARxlXsJs70UcmX3XLCibd3n7/pBh2aB3XO9XomegtdzimBxgm3gf0 eSCcl4IKh4HH+FclXzjH9/ZGurLs+ej3tSAvvyfAk6LWbctf4USZWV0+d1grkbRsDMac zzjQ== 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=qlnxGLQnJJGAm3DX4goOV1ioI3kaMCjX4CbHzdNY/vw=; fh=OkCwvtrKuZcKz3PEORE4ZF6gRP+Q7mCLD8HSThIfjpQ=; b=ELUbjK7WYCb6xurAeJqp7mMn+SbIkwijIy5S5imHjlWTN04HnUlnx+74m3hrxKGz9O 4QI3olGhTnE4j3/5j9fx2qBghUYLf+PAhjiaHj/BKaqCOrxxoCE8PqQPUqhX586rAHBU Cogm7nvz/Dqq1vnVViQPG7eJC2VB18CNEkl1bOd0QOmP+ppqjwh48R0j7dYdvwq91f5J TKMOIT/s4aQuvKO3QmpxLQ9XQCnDi2FXF1tdCeWZAbwM2GxB7onDHL9fJeu6n4jrWfrF jsOZFST6c8LkIZUK671M/7njBE55yFBNqUoyLSuSwOJW0KcFLP5jtfcl2OuEAkkz6gVk rQRQ==; dara=google.com 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-56929-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56929-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCXHSaAIp1Xfg6tYMH9tZDaO+aHm2F6bGRaqg2Rw6vYqCjeoRrovflc+NZKUVE+dqeqI594iJCyPOnAXGGyI8yf1cm5PFw== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id lf16-20020a170906ae5000b00a37f3e33007si1215926ejb.619.2024.02.07.10.46.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 10:46:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56929-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; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-56929-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56929-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 436581F22608 for ; Wed, 7 Feb 2024 18:46:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E5EAB12EBC7; Wed, 7 Feb 2024 18:43:30 +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 6825F85299 for ; Wed, 7 Feb 2024 18:43:21 +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=1707331403; cv=none; b=iBx1u5p5RBGG/zRPRHUB9bdItccs+YCa5+PCuJ+50hVi+6UGx45Gw6HUDrAEn/QVq4o3/5xLylwrqTdw6ni+bldYhQ5obwsahD4DwodzJ07NjfHaLKm4RscOw9Nzag4mitkKY/YceqU2Ne4I2KRlMrrJTUYVvYtHPpctXAx1jLw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331403; c=relaxed/simple; bh=ilkLmZbJFb+/vAwyD9IAoZLec6Zu+zWHyeLngMmfIFQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lVKGzqgH6fNW864gsG7uYraD73j8yMbVw8UEMN1q1M3DD7xvfYveOIh5vAycTdetAW3ifatQa/Hbsgl/421qy2MZw08ijZfyspjjdMBeIgMxr+8faZQUnwDEEAvBm1aznqkkkTXBoHgrMUT6/V2fZjXsDbOzw0++6pdYY9Uqhmw= 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 1rXmt4-0007PK-4K; Wed, 07 Feb 2024 19:43:10 +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 1rXmt2-0054X3-Nn; Wed, 07 Feb 2024 19:43:08 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt2-00HRs1-25; Wed, 07 Feb 2024 19:43:08 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Dmitry Torokhov , Greg Kroah-Hartman , Andy Shevchenko , Ulf Hansson , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 05/32] Input: synaptics-rmi4 - follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:19 +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 X-Developer-Signature: v=1; a=openpgp-sha256; l=1112; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=ilkLmZbJFb+/vAwyD9IAoZLec6Zu+zWHyeLngMmfIFQ=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86b5uqZYly+euxtkXa5tiGRisTdifEuh1Ixy mC277T9rpOJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOmwAKCRCPgPtYfRL+ TjEoCAC0nEJ9m1CYYfN8CT2VU987E9pfcisamQB6slHvQYnnkIKDQ7cDsZNuhYqqB9wNG0+GXCe TjkpSkoUhRbcNKtesSG8lYCH2IwfVRo5qXpoOQ3QrsVMwf3LX1Vttey0H7ktM6HjNuXaAV9il7D FFVN4HK+ktpdAbdxAjtz7PnH4Mmr5odBWM8D1ApH6Hc5aEVc/gdMwN55cPSSSQLhmD1xcBsA4UM kfJgrghTBPids2dkXNIhnXBc2b4yzr4JkqCswoWrD2ag3POBuwbNO7OULQGqM4JoYwYOfP0ZmkW tiSoFjptqTdpseeXaMHymOMtanZV3W+pzFOdjHfdLHxDT523 X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790266954946454277 X-GMAIL-MSGID: 1790266954946454277 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 Acked-by: Jonathan Cameron 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),