From patchwork Mon Jan 22 18:07:07 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: 190329 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2770873dyb; Mon, 22 Jan 2024 10:55:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IFNrUvYQRF0ThP3fZ7RF8UwDddTPItgMOB1eETsXqxM1NRr/wf3WobEYxDrtc6VxxznDG0q X-Received: by 2002:a05:6871:582c:b0:210:9faf:2ec5 with SMTP id oj44-20020a056871582c00b002109faf2ec5mr400061oac.106.1705949733084; Mon, 22 Jan 2024 10:55:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705949733; cv=pass; d=google.com; s=arc-20160816; b=XQLZ3ux8i22mPabFXpR26buBJC+Y+Fw7jzadV4lprXkI3DgYxCm1ekevbMoQQcf+IO ourrvarR9wd5Xrzssxx7TCpIuVdh4SsAGPAeSZMopMTYcX9ogXkP7IEMeZ9pDEpb6/0s mKlLpnjacOsYl5GdxjEeXzuNFdm36ddUKCzQm+wuBhdfOXhI6Lh1Z134XOWCVrgmXvyp 4SKgiL0cnJDCr/wdwOrcOYrJJsVmQTek/ERtjWuBuMGu6zd7FS1yKmCDuTcpSx3+Cd/t GoqhcTkOZyWyP/JHY2uIImQ7r0in0YqlmZLEH+jjnW0jahPJwYZycKlTxUOerWqnpczh pS/g== 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=W8Wt8rN3vSbFcLoiFwOWyKmFlO+wLRJ9kJdc84az4n0=; fh=h3rtE+HXFGYlcPbpvxtWc3AReHYN547mxT4U3WA2KMY=; b=OOsq1We5w0rxMqZTS+2Dc8UVUO92yECwacBeXU2/9UqUlFe3j+k/EYHSm6Kh9g2ZVg cGBQB6N/g4t6jSUyVdQmtjfgC1tq3JJ3KWPVEXFDoKwwYhY/CK9QE9yBfB9h8ekmypBL cwm5o+dO1HxpCu03R4QT1eXylGNSY5zRf+dmSIOor4GGVziG+kkSe4sH5SWX70Dla3Ov hxFViTHAP1JFCU4MBgWmPxI/qZ1ojr4Zl22S4LtpWL1jOxUKkdrSpS0Qu0ydULnbZPJr 8IDaS22dqIRM3SV+lL9xy8pQ4EDUOIjg4yHtoQtF2Xs6eM9dI4GuSXg/ZOZxTMsX9Z7x mOVw== 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-33932-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33932-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 e16-20020a630f10000000b005cd8cb67fe9si8531518pgl.583.2024.01.22.10.55.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 10:55:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-33932-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-33932-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33932-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 C8F3F283D03 for ; Mon, 22 Jan 2024 18:44:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2B3386351E; Mon, 22 Jan 2024 18:08: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 C65BF60DFB for ; Mon, 22 Jan 2024 18:08:31 +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=1705946913; cv=none; b=Olrdj/Zt2PWdYmrDwzaK8g9ycdxx3pFJKzs5DtzM1sgpDaJefetIwAYgG3xj247pYGtQ+ODAJy0lZotKtIyEIjCbl7xlrmCu9Dcv6HefqV0fH/d8omRSY080egVtaq6YCDFGQT2WYBoRaMe5rIvGFIzB5TG89tgMl/dcRaeQ3xk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705946913; c=relaxed/simple; bh=NBOC25sdOvGb/9mPNsZnEncAlQwVHEMnCLFxkavQ8DQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XrPxgwW5Djv/U5tLtlMgeQoHt+77V/ocbYVPKwPcOe9qvMdu5NuzftAkgZXscH/sZQ4b5X/pM+f/cdWQM1c2AA0qVuDpOhIaReb9HkBDzN2RnnnokRNnEHoFE9lRdLSVDVU9to38IpmS57fUBzgGDMVFNX1jILd6EBFMKBOsI78= 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 1rRyiW-0001qd-F5; Mon, 22 Jan 2024 19:08:16 +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 1rRyiV-001ePv-6S; Mon, 22 Jan 2024 19:08:15 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rRyiV-005ZxV-0L; Mon, 22 Jan 2024 19:08:15 +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 , Heiko Stuebner , Michal Simek , Amit Kumar Mahapatra via Alsa-devel , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Subject: [PATCH v2 12/33] mtd: dataflash: Follow renaming of SPI "master" to "controller" Date: Mon, 22 Jan 2024 19:07:07 +0100 Message-ID: <63d7d1f1e6fe564daf034c66eb3073aa265b7969.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=1009; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=NBOC25sdOvGb/9mPNsZnEncAlQwVHEMnCLFxkavQ8DQ=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlrq7QEfATD5xG2hpQG6DlgMRzWaTKGPWZHTQ2z pPbTlCX0dqJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZa6u0AAKCRCPgPtYfRL+ TilmCACJ2388gx/UewF/Ask4RyYTH4immf27buUsBhyAWpQD91hjhGO1pzM01We+2TVb2u8Jy6A FoGHOBwlRZf2Tx2aB4t7W5q1xTEPbyWoQ9bnQwfwgfXolDRDIV5GwM3ZqCz+h+eimI5QSMe767M kdX2SuNYwXeUFWMjjRVDqQ0aoRmsC6SNFSH3uxOrbKpwEwyJcGPbF517SxNU0OkcCAbrX9fzofM HT+90MYf3Hl3BvpMsEbIEScn1PJyzXQuftXRqV2CNqd+LfG5G2bIR1ywtj+s85K3Ub620706Qm4 ApiO+eZUFjSc5n57Dns7TZNVuXXKmFjwxbfOI1fcTbszlBMJ 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: 1788817947239671639 X-GMAIL-MSGID: 1788817947239671639 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 Acked-by: Miquel Raynal --- 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;