All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Martin Tůma" <tumic@gpxsee.org>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	"Mark Brown" <broonie@kernel.org>,
	"Geert Uytterhoeven" <geert+renesas@glider.be>
Cc: linux-spi@vger.kernel.org, kernel@pengutronix.de,
	Martin Tuma <martin.tuma@digiteqautomotive.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	linux-media@vger.kernel.org
Subject: Re: [PATCH 06/33] media: mgb4: Follow renaming of SPI "master" to "controller"
Date: Tue, 16 Jan 2024 11:17:49 +0100	[thread overview]
Message-ID: <dd1e05f3-dab6-41ac-8813-92a757f4badb@gpxsee.org> (raw)
In-Reply-To: <6c6e38ee916b4268c617d2603cfbe01ae083ecea.1705348269.git.u.kleine-koenig@pengutronix.de>

On 15. 01. 24 21:12, Uwe Kleine-König wrote:
> 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 <u.kleine-koenig@pengutronix.de>
> ---
>   drivers/media/pci/mgb4/mgb4_core.c | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/media/pci/mgb4/mgb4_core.c b/drivers/media/pci/mgb4/mgb4_core.c
> index 5bfb8a06202e..9bcf10a77fd3 100644
> --- a/drivers/media/pci/mgb4/mgb4_core.c
> +++ b/drivers/media/pci/mgb4/mgb4_core.c
> @@ -144,7 +144,7 @@ static int match_spi_adap(struct device *dev, void *data)
>   	return to_spi_device(dev) ? 1 : 0;
>   }
>   
> -static struct spi_master *get_spi_adap(struct platform_device *pdev)
> +static struct spi_controller *get_spi_adap(struct platform_device *pdev)
>   {
>   	struct device *dev;
>   
> @@ -152,7 +152,7 @@ static struct spi_master *get_spi_adap(struct platform_device *pdev)
>   	dev = device_find_child(&pdev->dev, NULL, match_spi_adap);
>   	mutex_unlock(&pdev->dev.mutex);
>   
> -	return dev ? container_of(dev, struct spi_master, dev) : NULL;
> +	return dev ? container_of(dev, struct spi_controller, dev) : NULL;
>   }
>   
>   static int init_spi(struct mgb4_dev *mgbdev, u32 devid)
> @@ -179,7 +179,7 @@ static int init_spi(struct mgb4_dev *mgbdev, u32 devid)
>   	};
>   	struct pci_dev *pdev = mgbdev->pdev;
>   	struct device *dev = &pdev->dev;
> -	struct spi_master *master;
> +	struct spi_controller *ctlr;
>   	struct spi_device *spi_dev;
>   	u32 irq;
>   	int rv, id;
> @@ -207,8 +207,8 @@ static int init_spi(struct mgb4_dev *mgbdev, u32 devid)
>   		return PTR_ERR(mgbdev->spi_pdev);
>   	}
>   
> -	master = get_spi_adap(mgbdev->spi_pdev);
> -	if (!master) {
> +	ctlr = get_spi_adap(mgbdev->spi_pdev);
> +	if (!ctlr) {
>   		dev_err(dev, "failed to get SPI adapter\n");
>   		rv = -EINVAL;
>   		goto err_pdev;
> @@ -242,8 +242,8 @@ static int init_spi(struct mgb4_dev *mgbdev, u32 devid)
>   
>   	spi_info.platform_data = &mgbdev->flash_data;
>   
> -	spi_dev = spi_new_device(master, &spi_info);
> -	put_device(&master->dev);
> +	spi_dev = spi_new_device(ctlr, &spi_info);
> +	put_device(&ctlr->dev);
>   	if (!spi_dev) {
>   		dev_err(dev, "failed to create MTD device\n");
>   		rv = -EINVAL;

Reviewed-by: Martin Tůma <martin.tuma@digiteqautomotive.com>


  reply	other threads:[~2024-01-16 10:17 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-15 20:12 [PATCH 00/33] spi: get rid of some legacy macros Uwe Kleine-König
2024-01-15 20:12 ` Uwe Kleine-König
2024-01-15 20:12 ` Uwe Kleine-König
2024-01-15 20:12 ` [PATCH 01/33] fpga: ice40-spi: Follow renaming of SPI "master" to "controller" Uwe Kleine-König
2024-01-20 15:29   ` Xu Yilun
2024-01-15 20:12 ` [PATCH 02/33] ieee802154: ca8210: " Uwe Kleine-König
2024-01-16 20:06   ` Simon Horman
2024-01-17 12:19   ` Stefan Schmidt
2024-01-15 20:12 ` [PATCH 03/33] iio: adc: ad_sigma_delta: " Uwe Kleine-König
2024-01-16  7:44   ` Nuno Sá
2024-01-21 16:27     ` Jonathan Cameron
2024-01-15 20:12 ` [PATCH 04/33] Input: pxspad - follow " Uwe Kleine-König
2024-01-16 19:14   ` Dmitry Torokhov
2024-01-15 20:12 ` [PATCH 05/33] Input: synaptics-rmi4 " Uwe Kleine-König
2024-01-16 19:14   ` Dmitry Torokhov
2024-01-15 20:12 ` [PATCH 06/33] media: mgb4: Follow " Uwe Kleine-König
2024-01-16 10:17   ` Martin Tůma [this message]
2024-01-15 20:12 ` [PATCH 07/33] media: netup_unidvb: " Uwe Kleine-König
2024-01-15 20:12 ` [PATCH 08/33] media: usb/msi2500: " Uwe Kleine-König
2024-01-15 20:12 ` [PATCH 09/33] media: v4l2-subdev: " Uwe Kleine-König
2024-01-15 20:12 ` [PATCH 10/33] misc: gehc-achc: " Uwe Kleine-König
2024-01-15 20:12 ` [PATCH 11/33] mmc: mmc_spi: " Uwe Kleine-König
2024-01-15 20:12 ` [PATCH 12/33] mtd: dataflash: " Uwe Kleine-König
2024-01-15 20:12   ` Uwe Kleine-König
2024-01-15 20:12 ` [PATCH 13/33] mtd: rawnand: fsl_elbc: Let .probe retry if local bus is missing Uwe Kleine-König
2024-01-15 20:12   ` Uwe Kleine-König
2024-01-15 20:13 ` [PATCH 14/33] net: ks8851: Follow renaming of SPI "master" to "controller" Uwe Kleine-König
2024-01-16 20:05   ` Simon Horman
2024-01-15 20:13 ` [PATCH 15/33] net: vertexcom: mse102x: " Uwe Kleine-König
2024-01-16 20:05   ` Simon Horman
2024-01-15 20:13 ` [PATCH 16/33] platform/chrome: cros_ec_spi: " Uwe Kleine-König
2024-01-18  3:49   ` Tzung-Bi Shih
2024-01-15 20:13 ` [PATCH 17/33] spi: bitbang: " Uwe Kleine-König
2024-01-15 20:13   ` Uwe Kleine-König
2024-01-16  8:33   ` Geert Uytterhoeven
2024-01-16  8:33     ` Geert Uytterhoeven
2024-01-16 12:47     ` Uwe Kleine-König
2024-01-16 12:47       ` Uwe Kleine-König
2024-01-19  7:11   ` kernel test robot
2024-01-19  7:11     ` kernel test robot
2024-01-15 20:13 ` [PATCH 18/33] spi: cadence-quadspi: Don't emit error message on allocation error Uwe Kleine-König
2024-01-15 20:13 ` [PATCH 19/33] spi: cadence-quadspi: Follow renaming of SPI "master" to "controller" Uwe Kleine-König
2024-01-15 20:13 ` [PATCH 20/33] spi: cavium: " Uwe Kleine-König
2024-01-15 20:13 ` [PATCH 21/33] spi: geni-qcom: " Uwe Kleine-König
2024-01-15 20:13 ` [PATCH 22/33] spi: loopback-test: " Uwe Kleine-König
2024-01-15 20:13 ` [PATCH 23/33] spi: slave-mt27xx: " Uwe Kleine-König
2024-01-15 20:13   ` Uwe Kleine-König
2024-01-16 15:41   ` Mark Brown
2024-01-16 15:41     ` Mark Brown
2024-01-15 20:13 ` [PATCH 24/33] spi: spidev: " Uwe Kleine-König
2024-01-15 20:13 ` [PATCH 25/33] staging: fbtft: " Uwe Kleine-König
2024-01-15 20:13   ` Uwe Kleine-König
2024-01-15 20:13 ` [PATCH 26/33] staging: greybus: spi: " Uwe Kleine-König
2024-01-16  5:38   ` Viresh Kumar
2024-01-15 20:13 ` [PATCH 27/33] tpm_tis_spi: " Uwe Kleine-König
2024-01-19 21:29   ` Jarkko Sakkinen
2024-01-15 20:13 ` [PATCH 28/33] usb: gadget: max3420_udc: " Uwe Kleine-König
2024-01-16  7:25   ` Herve Codina
2024-01-15 20:13 ` [PATCH 29/33] video: fbdev: mmp: " Uwe Kleine-König
2024-01-15 20:13   ` Uwe Kleine-König
2024-01-15 20:13 ` [PATCH 30/33] wifi: libertas: " Uwe Kleine-König
2024-01-18  9:26   ` Kalle Valo
2024-01-15 20:13 ` [PATCH 31/33] spi: fsl-lib: " Uwe Kleine-König
2024-01-15 20:13 ` [PATCH 32/33] spi: Drop compat layer from renaming " Uwe Kleine-König
2024-01-15 20:13 ` [PATCH 33/33] Documentation: spi: Update documentation for " Uwe Kleine-König
2024-01-16 14:40 ` [PATCH 00/33] spi: get rid of some legacy macros Mark Brown
2024-01-16 14:40   ` Mark Brown
2024-01-16 14:40   ` Mark Brown
2024-01-16 15:18   ` Uwe Kleine-König
2024-01-16 15:18     ` Uwe Kleine-König
2024-01-16 15:18     ` Uwe Kleine-König

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=dd1e05f3-dab6-41ac-8813-92a757f4badb@gpxsee.org \
    --to=tumic@gpxsee.org \
    --cc=broonie@kernel.org \
    --cc=geert+renesas@glider.be \
    --cc=kernel@pengutronix.de \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    --cc=martin.tuma@digiteqautomotive.com \
    --cc=mchehab@kernel.org \
    --cc=u.kleine-koenig@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.