Message ID | d741960846b7f4896eeff91a4c8c7dfa8a6f8b7b.1707324794.git.u.kleine-koenig@pengutronix.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-56927-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2434276dyb; Wed, 7 Feb 2024 10:46:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IGFtbgA7xXELPYsG7v3LQmZ34UL3tkErkNKEuxrRqMSYAS6pzb2cDii4rQngAlcaX9IFPZf X-Received: by 2002:a05:6870:5251:b0:204:f0b:3bfd with SMTP id o17-20020a056870525100b002040f0b3bfdmr7704641oai.43.1707331618519; Wed, 07 Feb 2024 10:46:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707331618; cv=pass; d=google.com; s=arc-20160816; b=w3LmT3c8P2ocwyFiwJeLvFWOKG4xgvasajslECaypHmYlXiDCz2WmKw2BlvsbXd+3N zyNaP66J7YKTA9VpwVn/f1RTmpzn3Ui+4GG8kFEazyuyvtkkb32+hAr3lUS1GNDQ6ikN lIHFZZNDB6hYNM5yZ1XArcfuy+s6ieELJ2gX0CO9dYj1YqlqkUXPWREHX6WjDEHcQW7L gc7W6SHbN7hijYu8424I4bNgXUxc3FV+tWiRsY6go5MKo4/L2b7MQdduRcpBlKqwSa/S SyvJGt8mR8aZbAOqMBucU2v3hvBaRpV4FceDjw56wRBPygo2SiCUBDsmFZ9AEjzJaIRL LOdA== 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=IQlNipdheQ2xqBvluFffj1klBLKeFWKyiJmG9R2Dea0=; fh=JmiqAnsjjsYuVhaFSApiOE41snMHlKJZVkUklRu1I98=; b=zzRGuHlamR/u9PDmGg1nZzUQ7NKSGB1og0Zt+nsqEQ1uwg+uYDogdRcjwZe0i2KmiZ Bjn56Mrw/ViSgus/ey5PEGGhhJWMlBRxt5GqlL/pw39BpQb59Q2cDnViCNGNxC1SNWxA ubtvXUM8kstTnFc/oB/F6uXRxFKtXre8EUoqxxD/Isu2DLHhikmfA0iy9UJ8+aYd3RI+ bHZo7yGTS2xiMdHjA2gmnIy3q5TsQ0R3KtVytaULXSf5q9U/gla/dWhwK9jaqZXug5s+ GOZCEAJ/czHr2LuOK5z2NorUXu1haya1nwiKSSZkjEcpT2q6SMXbf3QqpliZyMYPOYmC oY1w==; 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-56927-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56927-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCXKKKGCd/VNfojqoEfgd2W3gbbtYWWiPvtMn1ftue5P1sVL2KVlxt2lxSJH8LTn4MWSA33em00Zm+9N/ugrvwe5MHjrqw== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id bw19-20020a056a02049300b005d5c38b86b9si2173972pgb.110.2024.02.07.10.46.58 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 10:46:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56927-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-56927-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56927-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 47D23282979 for <ouuuleilei@gmail.com>; Wed, 7 Feb 2024 18:46:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4317B12EBD0; Wed, 7 Feb 2024 18:43:31 +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 11F4885943 for <linux-kernel@vger.kernel.org>; Wed, 7 Feb 2024 18:43:20 +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=E7KSLVucSaw35hxl7nlIEOMIz8Hba1sUjk2aevl+6tzFDJG9erKlT/G95vK/lBEFVn4Bi7hLeU2ar2fJWkOEhRKCPbpJx0EsWSeNY9Q3D95ZiEytaXcIhJ+bIG2xtMYzfE2RFTCRrFGIsKf3k/+a+wkFML1PAZHNi13a+qoUDRQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331403; c=relaxed/simple; bh=RbOvDVmurbfANfv8VPt3j5rWCMBhT6rMxR0v2GBXhN4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uREZ7UEPYSfEju4UvlTpWl0ozB4lUpDSZ5RetMVMe0K/kfKxPPzhdALRIbiValIqheA7lUEaeVV1UduQ+5KTXekUfq7EB5g7XzuRsVjzGoLthE25YVa8/4d9eVZV9VEakJlU0cVlCYdH19Spxt4GgSMEwMQMb+RgKtGeVbM7U/I= 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 1rXmt9-0007mI-Eo; Wed, 07 Feb 2024 19:43:15 +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 1rXmt9-0054Xx-2G; Wed, 07 Feb 2024 19:43:15 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from <ukl@pengutronix.de>) id 1rXmt8-00HRsw-3B; Wed, 07 Feb 2024 19:43:14 +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, Jonathan Cameron <Jonathan.Cameron@huawei.com> Subject: [PATCH v3 18/32] spi: cadence-quadspi: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:32 +0100 Message-ID: <d741960846b7f4896eeff91a4c8c7dfa8a6f8b7b.1707324794.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <cover.1707324793.git.u.kleine-koenig@pengutronix.de> References: <cover.1707324793.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=1151; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=RbOvDVmurbfANfv8VPt3j5rWCMBhT6rMxR0v2GBXhN4=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86qP+LJktb5dkl7rbmpmK/xxovvRS6CdS4pc qKGLZfaToCJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOqgAKCRCPgPtYfRL+ TgPICACEOB9h8aDM2Y6v2EVwZJouk5eaWTzwY3r62EzHehblZh3eWE8hbMVE4ggfzLMWsCh8nZ4 hwrXvjFYzSrS9knpA0IlE5CjRWPIpggKClkKWH69BllfWdHFRsRKDQ80Ng4IFpsos4ye19+/49T wplWugZUQYfyiJdoOtiMMJZqTN2gURsUli8soUDoIZWpd536oujqrhOgtFISveiWNBXmohzD9qO 71OInPWc7QkUWGXT5d16jndIpWhVJA9WarVwNnj2bpOq2jhVZdMPLly3VIKRMmMOPqS1romHIFC E5+IWGxVDmaV6MPQ7jQn2fQ/QW81p2X0F61RL9rLCGRa1uyN 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: 1790266959305827957 X-GMAIL-MSGID: 1790266959305827957 |
Series |
spi: get rid of some legacy macros
|
|
Commit Message
Uwe Kleine-König
Feb. 7, 2024, 6:40 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. Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> 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);