Message ID | 25ed09fe942039ac3e00051c0576bfa7a588853c.1705944943.git.u.kleine-koenig@pengutronix.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-33915-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2763358dyb; Mon, 22 Jan 2024 10:39:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IEe2dYEKxMt2PnDd6wlZxCRIRFHIbI8Ebz7LnrT0SGGpBMa3IFKCOFoR8/j3OimkmmsOwUI X-Received: by 2002:a05:600c:694:b0:40d:877d:ca9 with SMTP id a20-20020a05600c069400b0040d877d0ca9mr2575697wmn.104.1705948748453; Mon, 22 Jan 2024 10:39:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705948748; cv=pass; d=google.com; s=arc-20160816; b=l/AUDSGz50jCYKkj4f7jwqIr618Se2pHTvWXWnqPtpRfnw/p1YdIaTMsx393BHypyq P/mTZUv7PVY3EPkyUKmElqwD71yjJ/Gevy9f1cPLfjch5Wj/YidQagntD+Qz4eusvCe6 GNj9K81UYohMYItwbnpGkLG8ErpUqUvQp7Y05im36J80jZmyvKLEIdRMx7738Gvw540i 8kZINk1MqQikaXO8D9lSwg8Io8Z20dp1zEenMqG/XozOMTp2AhGx1VEfyJw1DBGfu1RW 97iG3KAuejH4kyzUdAQiZHMBaIP/YHeNRxDroWui0fbd1ct1SM7MVgMtRYStwiO6UOlm 2vtA== 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=N44MLgrZE+5Z7SIL4LcsCO27Vyrkob/sNlGiOKbdCN0=; fh=g86FLH24n5Wrsvd8J73mK5e2QWFYMTUEX7wI+AaaSaM=; b=whOa1V0+a0wP1BP/FFZg8sh3gYRVsVSF4HtZD9UV/zCeiVAyLo5biWVQG4WmLjeoIC UJX1zzhenXUNixHYvaLjeHGVDJw9hh4uL1zgQTNFWFslEWOJ/nQ06avk+LCvFlq8NfnE PySGOv//Pkua2NyeYJWGZdmPUl52qwLZyxatLIAz7UuuOVRLPsx66FglDLRsk7L07HI1 lKuS+crb0cDGBI265eWiFhGwUDkdVd5OkQpqDPX7CbSJUz1IF7NPePlUmmTk9jqZUZ9Z a44f9yAZKQudWtUQwXOTTjhSPV9MLZHpJtQr6O01ADhxJYoadwTD7Pl9uGezEuRIb7d9 c7Tw== 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-33915-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33915-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id en13-20020a056402528d00b0055472810fe5si11557725edb.124.2024.01.22.10.39.08 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 10:39:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-33915-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-33915-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33915-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 D985A1F24FA8 for <ouuuleilei@gmail.com>; Mon, 22 Jan 2024 18:38:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 77E86605D5; Mon, 22 Jan 2024 18:08:27 +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 240405FEEF for <linux-kernel@vger.kernel.org>; Mon, 22 Jan 2024 18:08: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=1705946904; cv=none; b=JfCcpG97sNVQwn0mYQWrnmG80sQlf9tzeGRZLrDwbg08fQACWheBzq87KgENqSmU9XFN6Y98/GIy7w5h8ks7o8Rfw2/CsiZozm8al5T25BfVrAktEPhgBJ3f5UUdAhJb0Hsut1IAnKJg7hXdH4PUYFD7JAIns0jlkYh9OBIylIg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705946904; c=relaxed/simple; bh=aQaJs5zOPqrNYXsF86uQSVSe/HBmYb++L9H1dH23v/0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eSvQRCRNPElVIweYIi26xEyoqI2LkBYtRof58MtQoUXgY/KwID+7W0LCHmIAW6NgJDX4URvQyKkKFfgBxMJ3K9Im/TQD3YNNKAchRZiNVIuidMCr93I0FzCeG2oguZEzB1cL7LRuQ2SUVSI0UV3fCyqZTufCgWCYyalxE7TDtdE= 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 <ukl@pengutronix.de>) id 1rRyiX-0001vA-Cm; Mon, 22 Jan 2024 19:08: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 <ukl@pengutronix.de>) id 1rRyiW-001eQP-Kw; Mon, 22 Jan 2024 19:08:16 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from <ukl@pengutronix.de>) id 1rRyiW-005Zy7-1r; Mon, 22 Jan 2024 19:08:16 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> To: Mark Brown <broonie@kernel.org> Cc: kernel@pengutronix.de, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 19/33] spi: cadence-quadspi: Follow renaming of SPI "master" to "controller" Date: Mon, 22 Jan 2024 19:07:14 +0100 Message-ID: <25ed09fe942039ac3e00051c0576bfa7a588853c.1705944943.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <cover.1705944943.git.u.kleine-koenig@pengutronix.de> References: <cover.1705944943.git.u.kleine-koenig@pengutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1093; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=aQaJs5zOPqrNYXsF86uQSVSe/HBmYb++L9H1dH23v/0=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlrq7ZdzpRpf6q8UTsNP3T0nfnHawuW0/OpFKXK QmRy5mu8EuJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZa6u2QAKCRCPgPtYfRL+ TmC4B/9sM3Ya60LQkzAlTriXzYLOLMAXgr6PZCcnH3ze9dIP+WcCYjNubsH/Y8wPXICzIfFwSzI Nfchiymlu5dVpX2P7oEGh6WZRujWLpXfEWKt0/DiiuehEb90EkSBNrRZdz2h3l3mI3xXsoo4dqd 0V2T1uyRUYyY789ao1Z888UkZZFlXIFt1/YVnVX0IaiLW1yChw7SaCecKjp1OWlhfO0nY+kfxb6 9Y3Hav2YDuOk3azp13zEC8dfQnswyrm6rOC24etkRGeo8BHH+Wvk5D1XvpsIBmuXjBwLlOwr55l +ZtxRuRSOsiUT/OLreDKgeMm6iBmID5yHdV1X7qIFaHHz6Ly 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788816914843924020 X-GMAIL-MSGID: 1788816914843924020 |
Series |
spi: get rid of some legacy macros
|
|
Commit Message
Uwe Kleine-König
Jan. 22, 2024, 6:07 p.m. UTC
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.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/spi/spi-cadence-quadspi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c index eb6cc861b00b..a5e2f7786b76 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -1410,7 +1410,7 @@ static int cqspi_mem_process(struct spi_mem *mem, const struct spi_mem_op *op) static int cqspi_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op) { int ret; - struct cqspi_st *cqspi = spi_master_get_devdata(mem->spi->master); + struct cqspi_st *cqspi = spi_controller_get_devdata(mem->spi->controller); struct device *dev = &cqspi->pdev->dev; ret = pm_runtime_resume_and_get(dev);