Skip to content

Commit ba0dada

Browse files
Yang Yingliangbroonie
authored andcommitted
spi: oc-tiny: switch to use modern name
Change legacy name master to modern name host or controller. No functional changed. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Link: https://lore.kernel.org/r/20230823033003.3407403-20-yangyingliang@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 8af8a27 commit ba0dada

1 file changed

Lines changed: 15 additions & 15 deletions

File tree

drivers/spi/spi-oc-tiny.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
/*
3-
* OpenCores tiny SPI master driver
3+
* OpenCores tiny SPI host driver
44
*
55
* https://opencores.org/project,tiny_spi
66
*
@@ -53,7 +53,7 @@ struct tiny_spi {
5353

5454
static inline struct tiny_spi *tiny_spi_to_hw(struct spi_device *sdev)
5555
{
56-
return spi_master_get_devdata(sdev->master);
56+
return spi_controller_get_devdata(sdev->controller);
5757
}
5858

5959
static unsigned int tiny_spi_baud(struct spi_device *spi, unsigned int hz)
@@ -212,24 +212,24 @@ static int tiny_spi_probe(struct platform_device *pdev)
212212
{
213213
struct tiny_spi_platform_data *platp = dev_get_platdata(&pdev->dev);
214214
struct tiny_spi *hw;
215-
struct spi_master *master;
215+
struct spi_controller *host;
216216
int err = -ENODEV;
217217

218-
master = spi_alloc_master(&pdev->dev, sizeof(struct tiny_spi));
219-
if (!master)
218+
host = spi_alloc_host(&pdev->dev, sizeof(struct tiny_spi));
219+
if (!host)
220220
return err;
221221

222-
/* setup the master state. */
223-
master->bus_num = pdev->id;
224-
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
225-
master->setup = tiny_spi_setup;
226-
master->use_gpio_descriptors = true;
222+
/* setup the host state. */
223+
host->bus_num = pdev->id;
224+
host->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
225+
host->setup = tiny_spi_setup;
226+
host->use_gpio_descriptors = true;
227227

228-
hw = spi_master_get_devdata(master);
228+
hw = spi_controller_get_devdata(host);
229229
platform_set_drvdata(pdev, hw);
230230

231231
/* setup the state for the bitbang driver */
232-
hw->bitbang.master = master;
232+
hw->bitbang.master = host;
233233
hw->bitbang.setup_transfer = tiny_spi_setup_transfer;
234234
hw->bitbang.txrx_bufs = tiny_spi_txrx_bufs;
235235

@@ -267,17 +267,17 @@ static int tiny_spi_probe(struct platform_device *pdev)
267267
return 0;
268268

269269
exit:
270-
spi_master_put(master);
270+
spi_controller_put(host);
271271
return err;
272272
}
273273

274274
static void tiny_spi_remove(struct platform_device *pdev)
275275
{
276276
struct tiny_spi *hw = platform_get_drvdata(pdev);
277-
struct spi_master *master = hw->bitbang.master;
277+
struct spi_controller *host = hw->bitbang.master;
278278

279279
spi_bitbang_stop(&hw->bitbang);
280-
spi_master_put(master);
280+
spi_controller_put(host);
281281
}
282282

283283
#ifdef CONFIG_OF

0 commit comments

Comments
 (0)