| Message ID | df79f22caf31d2c5ca2b15b33670323d1e1120c7.1707324794.git.u.kleine-koenig@pengutronix.de |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-56952-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id
ma11csp2436575dyb;
Wed, 7 Feb 2024 10:51:48 -0800 (PST)
X-Forwarded-Encrypted: i=3;
AJvYcCXFkMMiOU8KFjdqgoUEBpgBJrENHLGpmgKwrDYXu4XXhzqutCX2LyPZXPLHUj0UNERxhxOFIcXM1sM9bQVftglewnoieQ==
X-Google-Smtp-Source:
AGHT+IGFQ0lQXDuLRqyPreHFlFZH2pIZtVhPcVdd6tUCpYL/7RhrWY48weOJsYufQk/CorEssEVg
X-Received: by 2002:a2e:be0f:0:b0:2d0:ca58:c434 with SMTP id
z15-20020a2ebe0f000000b002d0ca58c434mr2199456ljq.21.1707331907931;
Wed, 07 Feb 2024 10:51:47 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1707331907; cv=pass;
d=google.com; s=arc-20160816;
b=ngJ5EKqRKsyr++E9mnHaJXk1ToIsSp9d3xQUi/0h8S5cR4HF6Wcjbl6JzZIBRDMz5p
lZcHkveUCuNjQQniXeev2f/K5ekoIZfY2G3Tvg+04mrSezdcOk3ImwDc/JD9I5J7J++/
Lh+a6i9kbjs+bHWRLifx0nFfnOWG+IchKdPMOqr8g5hsEh5EH9VWRLqGv8V02Ji2LnPH
Tv33NkD/wY6JFC+5XfnyPkdn/VGXuseyu7Ql5vSpLmxC5AcppjVliqcvXBGjhDBDXZVe
A4Jo+xx2E8C1q5giVOQEANLsq/2b3vix3hIZXFxQS7XF1LrePvG/1d50vxFhhqHS1XyJ
5ilw==
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=TJ5DBqZRTo+VcR8cxBB24O0d/ZgnPDy57+0NrtbJaDY=;
fh=kUxCPCXFrO6Wne9sJ7aJ9a3CGQdwNCPoYCXua3GGK+w=;
b=uJhDDbwl13otrSSDFC6+w2wsvx4eUgLLjj0PYNdHE4HYWMNBhVWC+To4qVMZBYl8Av
fWlZJRT0s/smC6VDCEuidr/u7vHi55pU+J7BoFg6t7V+b8zsm4ccQd3Ej1+LwHwwkcAr
M+HjRPvQo3Hxcazg1dZj8mWuYAsGm6j15kr6fzeYnrhhwmBRGdyIxxETEUb9YYNyJSFs
B0vjE/MPAuXXKgeZSv2S6burpolmVjo8d7nJIn4SJP4Nwyrc56sllMpN/63WTD7LJRMe
cTagnS9OAWwS19PcXpflXJ50umnTj04RQQHLFJn9GqNOcn+wPb/ZIIuJ5gWRg3fUvz6A
O8Jw==;
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-56952-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.80.249 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-56952-ouuuleilei=gmail.com@vger.kernel.org"
X-Forwarded-Encrypted: i=2;
AJvYcCUPeZDZnBIdfRaDhYpdoso9yD4AF9JGI6EQqxcqTeMG5cRu79oSzprwL6NBLC9iQfCIKIDxb3szABYmr4jwX4KByWR1+Q==
Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249])
by mx.google.com with ESMTPS id
cy22-20020a0564021c9600b005601d3237c3si1139953edb.505.2024.02.07.10.51.47
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 07 Feb 2024 10:51:47 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-56952-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-56952-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.80.249 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-56952-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 875D51F23999
for <ouuuleilei@gmail.com>; Wed, 7 Feb 2024 18:51:47 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 1C98313A263;
Wed, 7 Feb 2024 18:43:40 +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 3BDB212F5A1
for <linux-kernel@vger.kernel.org>; Wed, 7 Feb 2024 18:43: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=1707331414; cv=none;
b=WicPBoRZMFQifTyeQz4XyG6zDPtVE3BNC/KJRIcc2CNcdtlmn/PeRWyiwD+MHNOMaza7MO2fBbA7puDhHdyrB2JMMD9MGivI5gMFSTxmMmluKIlWfePk4HEELKnigGfl9pqnYhvobGoveGTJW2WKxyj+hI7iFL2G8ZIcRedcr40=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1707331414; c=relaxed/simple;
bh=jLSDSfpv7WSEI2jePythvXMi4bwtOGfFN61uJJKBvR4=;
h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version:Content-Type;
b=YxPpDCh8ripNT69FHvLkSiHbQYUMEhe2eMc/S5Au2AWBVVMAHbURg6aRGPOFLF9mb1FlnxwzX7YKg3qCXYYH8uiehV14P3xHFogRHLrbUjNqlXnXrb/gz2wT+YF7lVg6dbz0lEVWkXrSjR8JJrUGhSrLKReaWXp1NAA+iPPxqtk=
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 1rXmtC-0007se-3M; Wed, 07 Feb 2024 19:43:18 +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 1rXmtB-0054YL-A0; Wed, 07 Feb 2024 19:43:17 +0100
Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96)
(envelope-from <ukl@pengutronix.de>)
id 1rXmtB-00HRtR-0h;
Wed, 07 Feb 2024 19:43:17 +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,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
Javier Martinez Canillas <javierm@redhat.com>,
Sam Ravnborg <sam@ravnborg.org>,
Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com>,
dri-devel@lists.freedesktop.org,
linux-fbdev@vger.kernel.org,
linux-staging@lists.linux.dev,
linux-kernel@vger.kernel.org,
Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH v3 24/32] staging: fbtft: Follow renaming of SPI "master" to
"controller"
Date: Wed, 7 Feb 2024 19:40:38 +0100
Message-ID:
<df79f22caf31d2c5ca2b15b33670323d1e1120c7.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=1645;
i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id;
bh=jLSDSfpv7WSEI2jePythvXMi4bwtOGfFN61uJJKBvR4=;
b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw87GXqnqC9di7ObQ9f5f86SeO9J8OHbB6IyeF
M0/bFpSbpmJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOxgAKCRCPgPtYfRL+
TuGBB/9TlS6oRq9gEfvRb9gRhMiLfLJhtlORbYI0ifh40f/j0hyzeyZynD3Fq61MCA25AK4L1oL
bUEmiFI9dkmdpl/wxEeoFDRn3uUORsjdca5iTgkJ61wtS+nHjVGel9Itd+lMwVfVKjEOurt1mc2
QFyyRLeIt5WqYZhtg25+BcZnHayunBMMYQgFCPVv9FsauTTBQwpUJWl3B7rEoPfzPJENssYMRIO
MwvUqvxZfVtdIDlV5jpwCkzw7dgKr6qQECrj/iiev9zmuIJrkYjPKc/Kd1fQwnxbdkopXRbpvns
dBa9kOZixjMojyHMla3Xgcm7uqCKemj6XZLqGQIuEbIj7IhH
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: 1790267262339645352
X-GMAIL-MSGID: 1790267262339645352
|
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/staging/fbtft/fbtft-core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index 3626f429b002..68add4d598ae 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -794,7 +794,7 @@ int fbtft_register_framebuffer(struct fb_info *fb_info) if (par->txbuf.buf && par->txbuf.len >= 1024) sprintf(text1, ", %zu KiB buffer memory", par->txbuf.len >> 10); if (spi) - sprintf(text2, ", spi%d.%d at %d MHz", spi->master->bus_num, + sprintf(text2, ", spi%d.%d at %d MHz", spi->controller->bus_num, spi_get_chipselect(spi, 0), spi->max_speed_hz / 1000000); dev_info(fb_info->dev, "%s frame buffer, %dx%d, %d KiB video memory%s, fps=%lu%s\n", @@ -1215,7 +1215,7 @@ int fbtft_probe_common(struct fbtft_display *display, /* 9-bit SPI setup */ if (par->spi && display->buswidth == 9) { - if (par->spi->master->bits_per_word_mask & SPI_BPW_MASK(9)) { + if (par->spi->controller->bits_per_word_mask & SPI_BPW_MASK(9)) { par->spi->bits_per_word = 9; } else { dev_warn(&par->spi->dev,