From patchwork Wed Feb 7 18:40:18 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: 198068 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2439314dyb; Wed, 7 Feb 2024 10:57:34 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXRUqiL9GCkA3VgC/S3v5KrMYPVGUl+9yp9CqWjVH1YPv1c8NuZAnmE9ayOYRJtnlgnSb+U1MAZe2fBjpmplWUynWE+PA== X-Google-Smtp-Source: AGHT+IGuzc0z2LN8qYtc9kAyqsg/zJFQtrDcJa24cfDyGixnEpSjdUg8eZ1CJjmHlDO+aq/usR5Z X-Received: by 2002:a05:6a00:1d24:b0:6e0:5249:3d5a with SMTP id a36-20020a056a001d2400b006e052493d5amr587886pfx.14.1707332253726; Wed, 07 Feb 2024 10:57:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707332253; cv=pass; d=google.com; s=arc-20160816; b=AauEjQSmJOc/3zAl16mTd3WPSU8dBNKTCCvd1TSIK3Myqp9o1GeJZtgpF7TdqIh198 IFJ5dbXIH4tGsMHlM8Gp6iPxP7F/Cc1lC4lZbqQkwgbJDjWWAbb8xD0tqUVxfmB3RG3h +FgxCBIeS2MG+QYGyPu3/RFBsQ2wrtCSS/lL+2/truN2polVYuL8cylKkmj5BCWIWvBr Q5M/yKGlfHdryq0HCn4A4ULQn/bg5oiFwjwEnovEGUBScKY7SLB5S0ZHRVHz2PLREQ0t d8NJUTFbqMFaerht/Xe4r06ok7CaTYsdKdkcNALr+O8UykoldewHqZcWIOR3v3X9OW1u N7QQ== 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=qKU8fEdoUJRcAbgIxxWqyGks4TaU8smFuA66LY7Tim8=; fh=TF/i8F6dWeMg/ed0TAcRcYIolVfBI/iT5C1kgoWbd/A=; b=FI3rnwoA+K7ovH9OBHpiK+SpEHgQp32PA+v/shJKnpbwGQW71y7wCJrSDqITzIH254 G7GMWQs83fm+sR+Y2dawyX53w8g+9qKsB5196RcBACQs6moOc0Q00KKHAaT/ePQ5VZj9 VbWV1xiEuuxLli2sOYzzIRsiwcK+0EPYCAa2aQ40lkqQq9tBL5xh+8SoH5Pt4jAOEAhY FPxnIOPaMahW2RKahGuuU+cXpWIKmywhgZHCr+F6AkzBjogQszKDCXgIQQbW9lFzY/pW q24KBKM69EfcE9QCevUOse7Y4OecopnDAbPaNj1wEO5AyulVJ2SazW34/8vjBOeQQi7V gyqA==; 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-56937-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56937-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCU5Kby9jUlpGvtQaI2nUbLYJGkjuWQIn4rhOlP3bwHuY7E6OVzqIWjtBlvWGZKlQH5qp+j3wUrPbASvh6RA6oeBuhF2yg== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id ch2-20020a056a0208c200b005cf97c743c6si2214647pgb.749.2024.02.07.10.57.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 10:57:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56937-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-56937-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56937-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 166B9B269DA for ; Wed, 7 Feb 2024 18:50:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1A9FF13698F; Wed, 7 Feb 2024 18:43:37 +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 C16DA1272BE for ; Wed, 7 Feb 2024 18:43:22 +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=1707331407; cv=none; b=hMKUntfi7GmY2pHIWl5RivN6SiIkEeUD0jTfBqK1Axvgju95LliPIKfESIH5WakLVHJ1eXy2RpquWqQlA1vH4AshE7HNrqH6hkJDlm6ERefF34X+MY88+RbdzV85aTc3t9eHPWXWBdSKJivE2Rq6tz0rCEoNTLTOoege2uzUPVM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331407; c=relaxed/simple; bh=w0zib0uOKooelRoLHu2pzWNfd/AGL8toKNMFBf38rNI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tj5qBJokQikEfAAw1Xb+olf6xtb9Dw+C8v4E6f/5xPiRTpwU6T8qI28tzIHz3G22aEuj2dKkse6D9TI9iYX+O63v3UuqfoVmJ+IKfJZqG42WeXWvPnnfy/PHLqJKGbGtFXwD7zef9XXHF9k1UTELSDcJ/7sKlXHTOMhoTZEblgY= 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-0007PJ-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-0054X0-Gd; 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-00HRrx-1O; 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 , Jonathan Cameron , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 04/32] Input: pxspad - follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:18 +0100 Message-ID: <820fa151077dc192391d546aec35328680803f9f.1707324794.git.u.kleine-koenig@pengutronix.de> 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=1193; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=w0zib0uOKooelRoLHu2pzWNfd/AGL8toKNMFBf38rNI=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86a49NhPc2rBdHMRT3qom8TuhcSwM8PCc4D/ 75Kh/chVyGJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOmgAKCRCPgPtYfRL+ TrW9CACPbeIOVyr466gklm2IUIKjis01iGt6HkKm4UnTUD26/My5rpTW49fL3c7R/KJj8/Kxip2 cxBHk044T0BvLB7BWatDCF9t2CUf1wMkAZ4q+UiZaYzIqu/W7+z7NzL3H4sBpsSsLE0EPbSC8Ll 5W7rraAbWwpk1ebzWzwMaEzObo9TbExVCsRMoENY0tW4pU+JJ6m8wtR0N2SaNGxWH+5w0jXdl+b atoBC/7q4zcVQsI86QGh3hB12MA5B0IiO8suyN/pVXFVDp/O0rb4F45F6nyUyZetfnhyPKZNYAE pL72XnTyhznJA60T6U5N/Bz1DoDZ1duK6hH7I9QcqLNUX4a5 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: 1790267625768532921 X-GMAIL-MSGID: 1790267625768532921 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/joystick/psxpad-spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/joystick/psxpad-spi.c b/drivers/input/joystick/psxpad-spi.c index de734a927b4d..c47fc5f34bd0 100644 --- a/drivers/input/joystick/psxpad-spi.c +++ b/drivers/input/joystick/psxpad-spi.c @@ -342,8 +342,8 @@ static int psxpad_spi_probe(struct spi_device *spi) spi->mode = SPI_MODE_3; spi->bits_per_word = 8; /* (PlayStation 1/2 joypad might be possible works 250kHz/500kHz) */ - spi->master->min_speed_hz = 125000; - spi->master->max_speed_hz = 125000; + spi->controller->min_speed_hz = 125000; + spi->controller->max_speed_hz = 125000; spi_setup(spi); /* pad settings */