From patchwork Mon Jan 22 18:06:59 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: 190317 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2767582dyb; Mon, 22 Jan 2024 10:48:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IFuJ0TIlL5O0KyPbqhQzE2xuh0FMM2Q+YcM97as9SLzER7kUlzUTzUExDtHsacIDBzaMweE X-Received: by 2002:a17:90a:df85:b0:290:3eaf:e4b8 with SMTP id p5-20020a17090adf8500b002903eafe4b8mr6247493pjv.21.1705949287021; Mon, 22 Jan 2024 10:48:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705949287; cv=pass; d=google.com; s=arc-20160816; b=VQde+fLm02P9xXLtclAV1U99Tp2mupBIuWutojv2kDcfWA0rSme+oswP7qjTVYdx56 iAJ68HJpRI71dH4kCjzV/2AnGnpmJi63RVbmOZL8aH7qljyiHE4MVxdhZzXCQwWsOv1q k6AzAP/fRPIMnCDboFxBuuzXqSSXIqrVS9R2/otanBSwWG2kIICVeA877dbZzHCM0dDD Du1iHkSy+i0Y6uTuVCk1uKDyFX4kHen9lCdmSssKx3KA9M0AYVm5E10L+b341CLDCHim k82H6+CkaHxMg/QfFvag/0vYodnKazmlCdE6J2W+H5I8vlwJpB3g0MUjZkXyMuxAi9JJ QgGQ== 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=kdIg8GijSIuIoRMOIr5pql1sR9CqOOmAVomB+3nIyak=; fh=itkJTojQ4xRShw+XlVZA7EdlvrrgpZ1LuJqGEudkgLk=; b=Ec74QdaeeGzWZLD8HMsObEU6Qyl+KKhd9jW2dj2c2Zmme9cby+sgr8QnFzWJYctsSF gSzEqlChWKrL/+3YMuJrWgtbCrkQTB3ucMZn8IsvbU/vzNzxJQnIgCKCpSSmPbaCHnh4 8SrE7+jnVGqvjWniObNbxyNyzKpkyuTrvszLnNHMmofQwpwLHzpP8hBc1Yevm41UgjsE hf2o0r89EfbLLQhKN4Na1x230Dx8PyMQdMhFoO9JGNjLJScY6/1CjaJt5rksx6BB4tRZ E+FOWzeX1i/DdJgnkRE/5hyQIuE+FeZsji9Ol20+77dkP+R5bPAaUKMDsgr/EgXkdZqD s90g== 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-33911-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33911-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id q12-20020a17090a9f4c00b0029058ca5f4dsi5612911pjv.155.2024.01.22.10.48.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 10:48:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-33911-ouuuleilei=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-33911-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33911-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 2AF972915D0 for ; Mon, 22 Jan 2024 18:37:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0617260253; Mon, 22 Jan 2024 18:08:25 +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 B15235FBB9 for ; Mon, 22 Jan 2024 18:08: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=1705946903; cv=none; b=F4noNcnWMvVBArgQZGzoc5fSTAPNH+flXWzkWSLihEqI9OfluONr4bBobYZwfPTAYcRXollKPBooaSHYQq75epknK5SF5nv+3l9VUHlah42SHPycLZ0HZqymqJc/qOUJScCzqiCaetYc1wjJ4xY3TntZbqf96ifa2Ff9kl1TvCc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705946903; c=relaxed/simple; bh=j7ZdCt52bfgupTBsMJsdZqvductyF9ePTfbsKfhSWaw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PGp7dk6DbWYYvWKimZeeTtqLKRwYuzbchAVUI6XqhCOjriWUVzibz15dj1ekyNPHztswpX9G7gr/SQ5oNzZMZB2EUXKmEtil5d32gGYnEJh007bVS587e1ZUMNrxX8YRcsWXtnpZAWIA7I7e4HM+uakeYQhaM2mhYiRK3lZnYRI= 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 1rRyiT-0001le-S5; Mon, 22 Jan 2024 19:08:13 +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-001ePQ-FH; 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-005Zwz-1G; Mon, 22 Jan 2024 19:08:13 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Dmitry Torokhov , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Subject: [PATCH v2 04/33] Input: pxspad - follow renaming of SPI "master" to "controller" Date: Mon, 22 Jan 2024 19:06:59 +0100 Message-ID: <4ac573db17754d4e129e5e3ad7faba98f54e464e.1705944943.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=1135; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=j7ZdCt52bfgupTBsMJsdZqvductyF9ePTfbsKfhSWaw=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlrq7HQKHmd8SNboMfBioS/1JHaq0PpguJzZP0n dSkJmhchFOJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZa6uxwAKCRCPgPtYfRL+ TktmCACmMb5YxlvAuRoGn28G50wh0HVTREKHav7qWM+YHIJgq/+khqbjYEIjg0SlYrp10GhnrKq QD2uf/GUJmENWm0UIrM3ir37pVsuWs8KI9wsXlyLN15zpEC1fSvV0QRYSU2Q2a5dPQD9hB5uKui jzNnPb4NUSrZa+JHMXvIpWEwNlvm16W3slCAWXs6M69Gbiqgmy92gC/W6OMe8MaOVI4Fc7lacA/ SqFDcrtQayzrq5sZ28M11GF+inlBbVlWt1otr19lYF6R8o7eZMEjUiYvqL/4gpG0iDuT+mzEKeo OV2BEpMVeeL1zMIXjpFJj8N9GRKMqJ8D17VBjdpU6H6t+M0u 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: 1788817480000856717 X-GMAIL-MSGID: 1788817480000856717 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/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 */