From patchwork Wed Feb 7 18:40:37 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: 198069 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2439358dyb; Wed, 7 Feb 2024 10:57:37 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW3KmPGFXTh/PRLtwRo7+fNtl7JdN43+A+tDvtw4mwvcwXt8cxuE6TaAvN6ckdlnotvFNRcLfo7tYkbCU+0p5QxTssE9A== X-Google-Smtp-Source: AGHT+IFRq/eY9JxnwrxXu3M0ZE17hjFqxTPkubKNLmjUAwJdys9pOgIamhGtjdxnLoizPLj5Y4q6 X-Received: by 2002:a17:90b:3ece:b0:295:fd18:6ebf with SMTP id rm14-20020a17090b3ece00b00295fd186ebfmr3686497pjb.47.1707332257502; Wed, 07 Feb 2024 10:57:37 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707332257; cv=pass; d=google.com; s=arc-20160816; b=hHXIjdn8R6xbDOhwjww142dhAYar8Tf8o87TvNZGFlrc1VSf/TOYw6Tj9YUu0WDg5h qabtlIYf5VSepFMCRX76YdvFmtI7gxEq9ngiEziAhXHE/trCbwQNbUTf6dmKvLNKW0x9 5p5kvFdOAm5nK7Q55FV6oDJYzoAz0S8ksM2aJ8b7/ljKXMN1+3Jb99SAKPoWwba8hS9W zgRsVyQD1O4AMgKLS+BUJtr4NVcsFVFtQQkWcR7+qnibxE83xPKJPbDsany1PY6tmIa5 nuvp2XwEfuT3ZwQCpqBvePzgV4t4UBsYkkzGK9FGmvuAqbEtaOsATZvBYFMrmhuKDkMW yTHQ== 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=nHVzkNh5qlSuIJ9r8kuLRp1KK2p+QW8irK20skpX+bI=; fh=Xao7ZFa3lOiv7/hlLjFmEuYK4nDbwKjzUbFr/uBRaZc=; b=aUAbEJqf83TyvtQ1BNWGx3VE0j1WZ5+qcBDnEemMzTbdLnNxsAx6e0pzhPtTrSORfm A7S+FHzjOO2r+vM+t2oZa9M9Nwywp07CJ646MNx/Aux7Ue8NDI3qTscQQ4Ib9GYYhuXV HagHTxqtoKDE8G9l08I+20WzPudKxfnDbv5KFwUFlyoiEePwkJK0q1srm60+QBkzLBx9 UgomLj40GEh7eI0PQM8LRl0XfUTzwCgh2K85teZqW42WXN3Jn7mxlCfVNePayIVkU3Pa AXAqOCJCRvsaQ0yJ0Ugi8B/RO+OgpDv9PFgkgbFF1czvMbBu7A8g+upSPObDYygHuz39 vT0w==; 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-56933-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56933-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCWuTfF1AUxJXt4qJr97+CCyWTZi75+UVhDV5kaxT/o9J55B/zw3kwYNbjGMJZEKCZntq/ZkYiEBXarPlg4lPtPNJ0DFKA== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id q5-20020a17090a2dc500b0029631bd90c5si2193290pjm.156.2024.02.07.10.57.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 10:57:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56933-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-56933-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56933-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 3BF57B2720E for ; Wed, 7 Feb 2024 18:50:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3908D13699D; 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 555D4127B46 for ; Wed, 7 Feb 2024 18:43:23 +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=1707331405; cv=none; b=QyK0Xs52bdfqld0S1qVBCgkSOdk77odkQ+CaO4C9Hi38rd2wyCHtrqUAguHMbyZvy8uuXn+BiSgLtOBuPPATRW9DLzHKoyRlgN8p2Yl8qn/bzb4xrFNPDp/dcGkQKxT+jXHbAzmj8E1rq5UDj30cj4yQ/f9ukRkjTZNsQbB+zdg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331405; c=relaxed/simple; bh=f+Gz43aBncDHaeqjyCuKx4M3pTIgDVH1C6QnbLnn8E4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PLDCMVa1NNx897yrBng+FxYbkCV9EnEdn/mmse2BjsLgGORiTh/xLlfF7fwL7H9UbN7LGWbXUxaR2PBpy5TFhikSbAuukOKZtJ2DY+sZud5gzq38hzzy6Tz2E09lzUo6AONgRt2n6Nv4x4cBCmsfoQ7apfgcAXUV/a47TsFrA2w= 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 1rXmtB-0007p0-Bq; Wed, 07 Feb 2024 19:43:17 +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 1rXmtA-0054YG-UF; Wed, 07 Feb 2024 19:43:16 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmtA-00HRtN-2l; Wed, 07 Feb 2024 19:43:16 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 23/32] spi: spidev: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:37 +0100 Message-ID: <15ebfdf58a6590962bdd51b49b2e85a69b3bf443.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=1094; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=f+Gz43aBncDHaeqjyCuKx4M3pTIgDVH1C6QnbLnn8E4=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86/oPdwhihCkIyCjc5ukJhojEhPOFeci3qVw swHLmcRSz+JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOvwAKCRCPgPtYfRL+ TjHYCACBp+IFKdXejHOMNxfTqboFn2a/edghYu3mR7tSY8ZSz6rJIcD4YKALjzDJrwTKOOdJR6q U5WcHS/pLQALvLaCEExTGm52vnMrwEPpKkTEQlCdSL8kEUmIqNC9yqHImiNWBx549O16KxRK3ut yH7n6tcyFHLLrOrgxUG4bosqjyUbq6jPOd74cIh6hOE0L790Vrw0otUncgOm+dmRmPq/3CEbQMP MsdST6AVuHMcHGlFqM2qLG8gEhvE82lioxIJN6gSYXiP5i9JrhImToU8g+jC++KCBQ7CycOTIgw t8v4SKj8c4LkCT1Yufk8Av1HcY4R+AXZnN74EQzN9+WhY0O5 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: 1790267629399058414 X-GMAIL-MSGID: 1790267629399058414 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: Jonathan Cameron Signed-off-by: Uwe Kleine-König --- drivers/spi/spidev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 655f2c959cd4..95fb5f1c91c1 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -802,7 +802,7 @@ static int spidev_probe(struct spi_device *spi) spidev->devt = MKDEV(SPIDEV_MAJOR, minor); dev = device_create(&spidev_class, &spi->dev, spidev->devt, spidev, "spidev%d.%d", - spi->master->bus_num, spi_get_chipselect(spi, 0)); + spi->controller->bus_num, spi_get_chipselect(spi, 0)); status = PTR_ERR_OR_ZERO(dev); } else { dev_dbg(&spi->dev, "no minor number available!\n");