Received: by 2002:a05:7412:8d09:b0:fa:4c10:6cad with SMTP id bj9csp67688rdb; Mon, 15 Jan 2024 12:22:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IGDX+zdB3olEGba05f0cACK+nBDXcD958HAeWFv0uG2J5FSNwuvqxmBtVB+uh533PzPub9P X-Received: by 2002:a17:90a:1f8f:b0:286:a502:dfe2 with SMTP id x15-20020a17090a1f8f00b00286a502dfe2mr4157121pja.52.1705350138692; Mon, 15 Jan 2024 12:22:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705350138; cv=none; d=google.com; s=arc-20160816; b=N4Re7RV0RzSlMiI+Q6BDhkK/RhMg9czIjjFn3ZczC4eblR9OGyPgt+yOUC6Jk1lKW4 nQgZbR3GpY6sj5bGWSy8GcgHYzHHGIYEyUrugwDLtkXtrwdAG6Yul2DqkfdkSIWB4Usa WtCHZ5VeYS0M7WUcCHcQdIwhcmWDER4A16FaUKp1kBc9wUXUfFGdZcG8cnvrTB1XHm38 oyAtZQkpQ24kOtNuYjz8vmwoswzPf0yE2fbTtCUbF2hmxQq9P3DB7Lei4f4267RM5Xbd GzNKgzfV7q7BFlHn+r3OIJr7AlhW/uezk+M3jI4tUJipBcze2XoyVS460vlQ7T/yCzxh SFxw== ARC-Message-Signature: i=1; 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=QfG2l5agZ4prxbRnlZd0zjMAHQZI4Ey8oXPCtESoI60=; fh=y9aGHcg5/cNCCOm+YNl0jPeqCyz+Kq3y5SF2DyCNcEg=; b=zuoMYixkA0blhJLtUCTuGM3997SnuJ1cIKft6C2CU6l7FpzTX9R3yWRrVTqJvns9Qw UXqGYVSLHbJUqVnopWefGn5hvA/8IWwpkEQ5A1WePj2nAX2/3OZ9ZEQ8t/sfSOacch2g w64grjxdWRgay5Lk8P1+zaFr4MtxR+uZppbE6k8Z0WO9U2G2AGtyZrQHHWTHjtLPgwGK nkMnsdq8bC87/mUTFDEXyDcOQze/ucCIGi5ESt6QiWrnEFaSzPltLZ8dr6XD6h5t4czI D18aUvg2UyJbK3mEK6CkpVOwB3JUp6LoFaIw67Lid8rpWwoGdysxucvYnzxBiRcXDtuO Jf2Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless+bounces-1944-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-wireless+bounces-1944-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id a6-20020a17090a854600b0028e35b2724asi4480516pjw.41.2024.01.15.12.22.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 12:22:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless+bounces-1944-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless+bounces-1944-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-wireless+bounces-1944-linux.lists.archive=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 9357EB20D6D for ; Mon, 15 Jan 2024 20:22:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 56C5C1A5AE; Mon, 15 Jan 2024 20:21:24 +0000 (UTC) X-Original-To: linux-wireless@vger.kernel.org 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 0651A19BDE for ; Mon, 15 Jan 2024 20:21:23 +0000 (UTC) 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 1rPTSJ-00050q-KB; Mon, 15 Jan 2024 21:21:11 +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 1rPTSJ-0005hp-3A; Mon, 15 Jan 2024 21:21:11 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rPTSJ-000N99-02; Mon, 15 Jan 2024 21:21:11 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown , Geert Uytterhoeven Cc: linux-spi@vger.kernel.org, kernel@pengutronix.de, Kalle Valo , Dmitry Antipov , Michal Simek , Amit Kumar Mahapatra , libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org Subject: [PATCH 30/33] wifi: libertas: Follow renaming of SPI "master" to "controller" Date: Mon, 15 Jan 2024 21:13:16 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1120; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=CilgUXn9sYnDzeXUBV/K3zS5xmEAYPQmSA4m63seKdk=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlpZHi9oLLoowITBN5S7io8wKs2b+sTo+Tnck0X PYYVS9ioBuJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZaWR4gAKCRCPgPtYfRL+ Tuc6B/99UXFdbq9RRhmAcP+eXGKu3vvNAzW2hyj2PgdWq/5WkM97mQOeIMcksFoAnxE0HJNPI1u oCt3Zwlk0B8V56WfGHK/rcCsw6CDsu1zy/gZ8HzbQSoJbJZC7oSZeQKJOD/TAJ8SCjRv23xwpU+ scwrox96U29cCMeKG7r/nW+bQ+p1YGCM8ydB/M8e0/3MC14osg+wSUWK4UYmOEU6vnoQnsTxJHR xy1mPr+4Hx3iF0Y1200bnv3f2wfUcw+G68btaKOEF4nOmBGcFXK5YFmsX/ynn31/zJG3hO1eToX w6NNhTx64W8yRc+n/rD/nqCm1vRrRT5tBU0jWJN7kOsg7cBH 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-wireless@vger.kernel.org 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 --- drivers/net/wireless/marvell/libertas/if_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/marvell/libertas/if_spi.c b/drivers/net/wireless/marvell/libertas/if_spi.c index 8690b0114e23..b722a6587fd3 100644 --- a/drivers/net/wireless/marvell/libertas/if_spi.c +++ b/drivers/net/wireless/marvell/libertas/if_spi.c @@ -1052,7 +1052,7 @@ static int if_spi_init_card(struct if_spi_card *card) "attached to SPI bus_num %d, chip_select %d. " "spi->max_speed_hz=%d\n", card->card_id, card->card_rev, - card->spi->master->bus_num, + card->spi->controller->bus_num, spi_get_chipselect(card->spi, 0), card->spi->max_speed_hz); err = if_spi_prog_helper_firmware(card, helper); -- 2.43.0