From patchwork Wed Feb 7 18:40:26 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: 198056 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2436442dyb; Wed, 7 Feb 2024 10:51:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IFwvG4cXQEax0vWiaDHhsr3mMivC6V/KcTx4tmJZkM5FP8PjcprUsr3U1M8ylqF6GgWB/S3 X-Received: by 2002:a9d:6b15:0:b0:6e2:bc08:d9a0 with SMTP id g21-20020a9d6b15000000b006e2bc08d9a0mr1776145otp.26.1707331890375; Wed, 07 Feb 2024 10:51:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707331890; cv=pass; d=google.com; s=arc-20160816; b=BXp5h3S/zatbVtj+rkJQJ/X3O2COOvKKqcfcRA4PBbScPE8Ex+XQoaqFq0akPubYwx 8mYWumEYjK1AYTwYPYcpUjzZa6uu8JTp80mhGzpvUVLewnbYtQlCy1cREeg7o1Z3IPr9 dFnjqYGEXRwJZ17p05CoOLpizQaFITUHQt9GYTkHEG/dTN1b9oFqqQT1Jpm7QEX83XJV feqtYNKI9j1Nfuwo9BB/LFUsHueCt3CnV1AY74CfTGq8JLlURAlejmJq1DSS2OQmhhb/ 5LeWvuxZt1VuYVif9/SNb35Fnjr5NbJeCHU1TcKrwsQTe1FtfWX5qg7yjrdh20WY3HoY NtAA== 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=p6WWhH4W/IFxe9n+FhJCTii+xa2Tq/vvXFEwGqW+9dQ=; fh=Upmf+xEBAFbl90hkwso1XKh02XVzhJrUdVnoxwA1rYo=; b=X2viBQA7iQC50Sn4eYb1UecspfwMJyQ5NVfZhyy2w20PZn/iUM+b+LzXlnIsuTm/7y Js3BeW8ISYSjq+cblQENnmN/kYDUQKoMEum2yefOYmBxCHILRH6GlcljfNoTM7N9Nb6S 8H8NS8rsYIYzT3RgrZEQiCGX7p4xk/FonOE2wuX3+BJbMvX/jZyeV6wyAsjqlYUaygxi MdoVEmvJd8QlK6mQv1RzcpLUocVtBG10n8o9cdsoXGibpVM1HtIICj+yxWXNL50ydlnC Fs7k0fqPRnkgs5Fu3SY4OlrdOOC+zXA168pfcCinXT+PinOz331Eltf+nLm9hlExuvpf 8mbg==; 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-56947-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56947-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCWCpi+2WCjMfDkIqXGx7IdBPIiIFDpAAn7XaxsBS/bmbj62sTx+ZJSG/OnI5Dojm7ZvMjVBk04mYlk98xQ2y0YAkrNwPw== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id m22-20020a05622a119600b0042c21171241si1717230qtk.638.2024.02.07.10.51.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 10:51:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56947-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-56947-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56947-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 2BC2F1C2086A for ; Wed, 7 Feb 2024 18:51:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9DB3C13A240; Wed, 7 Feb 2024 18:43:39 +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 3FB8B85C6B for ; Wed, 7 Feb 2024 18:43:27 +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=1707331410; cv=none; b=pwO80u5zke3vowkzThcv27CPCA18PwpjIXxmFp6Ytz5uPK4wB8lMKZx4yBZyi9Sf7teyyY487gF2a0F/dFUXSSXY5QQW3cmDmUmPqEE2QoRPeJjc0AapI1uQXuNlL5BIlMCxv2oM1XE2YWTJT0ndyh3kQDBhDC01kLE4PQiz9PE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331410; c=relaxed/simple; bh=Nj1hfFsyjq6xs8JqMS+euEQwaY/7srUsVpEx0j3EMYE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pBt8zU0k6flPx6S04G+IsOsJmsfK2vAawMgxBr4EbXK2HHkIi5Tgk5tPmCXgPtLjUO2swTIHwctlKA4TjKppmC2R8PyLFHOhQ2IhCGA8eLimmdK4zpIaI5tRowa7t9Ly0PIpao256POeFlkGaKcCRZZ7r4NK6qwoIytSExBcVso= 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 1rXmt8-0007UO-6s; Wed, 07 Feb 2024 19:43:14 +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 1rXmt5-0054XY-3P; Wed, 07 Feb 2024 19:43:11 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt5-00HRsY-02; Wed, 07 Feb 2024 19:43:11 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Rob Herring , Jonathan Cameron , Amit Kumar Mahapatra , Amit Kumar Mahapatra via Alsa-devel , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 12/32] mtd: dataflash: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:26 +0100 Message-ID: <38bf50b391c117621e406fa8cd00c4daef78615c.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=1120; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=Nj1hfFsyjq6xs8JqMS+euEQwaY/7srUsVpEx0j3EMYE=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86jMqw4ltSTXwLQoh9w6paW5SuiO+i/OQP4/ aOSlb/Cxo6JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOowAKCRCPgPtYfRL+ TjrnCACykE5iNjuwUOalnLCibPbZzFNctipOmpqjUPC8qgwgD5BYLPLFNHhOX5G0Isz2+UbaG89 0AU2cfpxvSwpkFvt8Y0OkUYwClhioF+9d6lQ/qBoGXQ3VXQBlAB/L99vvk764QKk0dknR3ctVZn kNJi7XbxtiY8SWFYhs7xh/XQnKlb8spVTPs2P5XBok7m7S0FWuSVpQY8CWAvyucGjpEtSPYcxBc JE8tsv9mFFU3DGEPsy7l/9ZHo6yEjrinlOIpsESpd20SgfTKJ/8CuY28zfK58vmSCYy14oHgDGW jyuow/xCdY+iCtvbqNdMja+reRkwAfXFAxP8uaONYkVN5Ymt 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: 1790267244532717133 X-GMAIL-MSGID: 1790267244532717133 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: Miquel Raynal Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-König --- drivers/mtd/devices/mtd_dataflash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 0c1b93303618..ec52277e3dd5 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -638,7 +638,7 @@ static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages, /* name must be usable with cmdlinepart */ sprintf(priv->name, "spi%d.%d-%s", - spi->master->bus_num, spi_get_chipselect(spi, 0), + spi->controller->bus_num, spi_get_chipselect(spi, 0), name); device = &priv->mtd;