Commit bdeef5dc authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown

spi: rspi: Get rid of unused struct rspi_plat_data

No in-kernel users of struct rspi_plat_data. If required,
the software nodes should be used for such users. For now
just get rid of it.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://msgid.link/r/20240325142118.3210915-1-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 10402419
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/sh_dma.h> #include <linux/sh_dma.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/rspi.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#define RSPI_SPCR 0x00 /* Control Register */ #define RSPI_SPCR 0x00 /* Control Register */
...@@ -1131,16 +1130,12 @@ static struct dma_chan *rspi_request_dma_chan(struct device *dev, ...@@ -1131,16 +1130,12 @@ static struct dma_chan *rspi_request_dma_chan(struct device *dev,
static int rspi_request_dma(struct device *dev, struct spi_controller *ctlr, static int rspi_request_dma(struct device *dev, struct spi_controller *ctlr,
const struct resource *res) const struct resource *res)
{ {
const struct rspi_plat_data *rspi_pd = dev_get_platdata(dev);
unsigned int dma_tx_id, dma_rx_id; unsigned int dma_tx_id, dma_rx_id;
if (dev->of_node) { if (dev->of_node) {
/* In the OF case we will get the slave IDs from the DT */ /* In the OF case we will get the slave IDs from the DT */
dma_tx_id = 0; dma_tx_id = 0;
dma_rx_id = 0; dma_rx_id = 0;
} else if (rspi_pd && rspi_pd->dma_tx_id && rspi_pd->dma_rx_id) {
dma_tx_id = rspi_pd->dma_tx_id;
dma_rx_id = rspi_pd->dma_rx_id;
} else { } else {
/* The driver assumes no error. */ /* The driver assumes no error. */
return 0; return 0;
...@@ -1290,7 +1285,6 @@ static int rspi_probe(struct platform_device *pdev) ...@@ -1290,7 +1285,6 @@ static int rspi_probe(struct platform_device *pdev)
struct spi_controller *ctlr; struct spi_controller *ctlr;
struct rspi_data *rspi; struct rspi_data *rspi;
int ret; int ret;
const struct rspi_plat_data *rspi_pd;
const struct spi_ops *ops; const struct spi_ops *ops;
unsigned long clksrc; unsigned long clksrc;
...@@ -1305,11 +1299,7 @@ static int rspi_probe(struct platform_device *pdev) ...@@ -1305,11 +1299,7 @@ static int rspi_probe(struct platform_device *pdev)
goto error1; goto error1;
} else { } else {
ops = (struct spi_ops *)pdev->id_entry->driver_data; ops = (struct spi_ops *)pdev->id_entry->driver_data;
rspi_pd = dev_get_platdata(&pdev->dev); ctlr->num_chipselect = 2; /* default */
if (rspi_pd && rspi_pd->num_chipselect)
ctlr->num_chipselect = rspi_pd->num_chipselect;
else
ctlr->num_chipselect = 2; /* default */
} }
rspi = spi_controller_get_devdata(ctlr); rspi = spi_controller_get_devdata(ctlr);
......
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Renesas SPI driver
*
* Copyright (C) 2012 Renesas Solutions Corp.
*/
#ifndef __LINUX_SPI_RENESAS_SPI_H__
#define __LINUX_SPI_RENESAS_SPI_H__
struct rspi_plat_data {
unsigned int dma_tx_id;
unsigned int dma_rx_id;
u16 num_chipselect;
};
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment