Skip to content

Commit

Permalink
spi: switch to use modern name (part3)
Browse files Browse the repository at this point in the history 
Merge series from Yang Yingliang <yangyingliang@huawei.com>:

I'm trying to rename the legacy name to modern name used in SPI drivers,
this is part3 patchset.

After introducing devm_spi_alloc_host/spi_alloc_host(), the legacy
named function devm_spi_alloc_master/spi_alloc_master() can be replaced.
And also change other legacy name master/slave to modern name host/target
or controller. Each patch compile test passed.
  • Loading branch information
Mark Brown committed Sep 11, 2023
2 parents 7a4feff + ee0f793 commit fffae3a
Show file tree
Hide file tree
Showing 21 changed files with 628 additions and 628 deletions.
20 changes: 10 additions & 10 deletions drivers/spi/spi-lm70llp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* the SPI/Microwire bus interface. This driver specifically supports an
* NS LM70 LLP Evaluation Board, interfacing to a PC using its parallel
* port to bitbang an SPI-parport bridge. Accordingly, this is an SPI
* master controller driver. The hwmon/lm70 driver is a "SPI protocol
* host controller driver. The hwmon/lm70 driver is a "SPI protocol
* driver", layered on top of this one and usable without the lm70llp.
*
* Datasheet and Schematic:
Expand Down Expand Up @@ -189,7 +189,7 @@ static void spi_lm70llp_attach(struct parport *p)
{
struct pardevice *pd;
struct spi_lm70llp *pp;
struct spi_master *master;
struct spi_controller *host;
int status;
struct pardev_cb lm70llp_cb;

Expand All @@ -202,17 +202,17 @@ static void spi_lm70llp_attach(struct parport *p)
* the lm70 driver could verify it, reading the manf ID.
*/

master = spi_alloc_master(p->physport->dev, sizeof(*pp));
if (!master) {
host = spi_alloc_host(p->physport->dev, sizeof(*pp));
if (!host) {
status = -ENOMEM;
goto out_fail;
}
pp = spi_master_get_devdata(master);
pp = spi_controller_get_devdata(host);

/*
* SPI and bitbang hookup.
*/
pp->bitbang.master = master;
pp->bitbang.master = host;
pp->bitbang.chipselect = lm70_chipselect;
pp->bitbang.txrx_word[SPI_MODE_0] = lm70_txrx;
pp->bitbang.flags = SPI_3WIRE;
Expand All @@ -228,7 +228,7 @@ static void spi_lm70llp_attach(struct parport *p)

if (!pd) {
status = -ENOMEM;
goto out_free_master;
goto out_free_host;
}
pp->pd = pd;

Expand Down Expand Up @@ -287,8 +287,8 @@ static void spi_lm70llp_attach(struct parport *p)
parport_release(pp->pd);
out_parport_unreg:
parport_unregister_device(pd);
out_free_master:
spi_master_put(master);
out_free_host:
spi_controller_put(host);
out_fail:
pr_info("spi_lm70llp probe fail, status %d\n", status);
}
Expand All @@ -309,7 +309,7 @@ static void spi_lm70llp_detach(struct parport *p)
parport_release(pp->pd);
parport_unregister_device(pp->pd);

spi_master_put(pp->bitbang.master);
spi_controller_put(pp->bitbang.master);

lm70llp = NULL;
}
Expand Down
56 changes: 28 additions & 28 deletions drivers/spi/spi-lp8841-rtc.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* SPI master driver for ICP DAS LP-8841 RTC
* SPI host driver for ICP DAS LP-8841 RTC
*
* Copyright (C) 2016 Sergei Ianovich
*
Expand Down Expand Up @@ -73,13 +73,13 @@ bitbang_txrx_be_cpha0_lsb(struct spi_lp8841_rtc *data,
/* clock starts at inactive polarity */
for (; likely(bits); bits--) {

/* setup LSB (to slave) on leading edge */
/* setup LSB (to target) on leading edge */
if ((flags & SPI_CONTROLLER_NO_TX) == 0)
setmosi(data, (word & 1));

usleep_range(usecs, usecs + 1); /* T(setup) */

/* sample LSB (from slave) on trailing edge */
/* sample LSB (from target) on trailing edge */
word >>= 1;
if ((flags & SPI_CONTROLLER_NO_RX) == 0)
word |= (getmiso(data) << 31);
Expand All @@ -95,11 +95,11 @@ bitbang_txrx_be_cpha0_lsb(struct spi_lp8841_rtc *data,
}

static int
spi_lp8841_rtc_transfer_one(struct spi_master *master,
spi_lp8841_rtc_transfer_one(struct spi_controller *host,
struct spi_device *spi,
struct spi_transfer *t)
{
struct spi_lp8841_rtc *data = spi_master_get_devdata(master);
struct spi_lp8841_rtc *data = spi_controller_get_devdata(host);
unsigned count = t->len;
const u8 *tx = t->tx_buf;
u8 *rx = t->rx_buf;
Expand Down Expand Up @@ -128,15 +128,15 @@ spi_lp8841_rtc_transfer_one(struct spi_master *master,
ret = -EINVAL;
}

spi_finalize_current_transfer(master);
spi_finalize_current_transfer(host);

return ret;
}

static void
spi_lp8841_rtc_set_cs(struct spi_device *spi, bool enable)
{
struct spi_lp8841_rtc *data = spi_master_get_devdata(spi->master);
struct spi_lp8841_rtc *data = spi_controller_get_devdata(spi->controller);

data->state = 0;
writeb(data->state, data->iomem);
Expand Down Expand Up @@ -182,48 +182,48 @@ static int
spi_lp8841_rtc_probe(struct platform_device *pdev)
{
int ret;
struct spi_master *master;
struct spi_controller *host;
struct spi_lp8841_rtc *data;

master = spi_alloc_master(&pdev->dev, sizeof(*data));
if (!master)
host = spi_alloc_host(&pdev->dev, sizeof(*data));
if (!host)
return -ENOMEM;
platform_set_drvdata(pdev, master);
platform_set_drvdata(pdev, host);

master->flags = SPI_CONTROLLER_HALF_DUPLEX;
master->mode_bits = SPI_CS_HIGH | SPI_3WIRE | SPI_LSB_FIRST;
host->flags = SPI_CONTROLLER_HALF_DUPLEX;
host->mode_bits = SPI_CS_HIGH | SPI_3WIRE | SPI_LSB_FIRST;

master->bus_num = pdev->id;
master->num_chipselect = 1;
master->setup = spi_lp8841_rtc_setup;
master->set_cs = spi_lp8841_rtc_set_cs;
master->transfer_one = spi_lp8841_rtc_transfer_one;
master->bits_per_word_mask = SPI_BPW_MASK(8);
host->bus_num = pdev->id;
host->num_chipselect = 1;
host->setup = spi_lp8841_rtc_setup;
host->set_cs = spi_lp8841_rtc_set_cs;
host->transfer_one = spi_lp8841_rtc_transfer_one;
host->bits_per_word_mask = SPI_BPW_MASK(8);
#ifdef CONFIG_OF
master->dev.of_node = pdev->dev.of_node;
host->dev.of_node = pdev->dev.of_node;
#endif

data = spi_master_get_devdata(master);
data = spi_controller_get_devdata(host);

data->iomem = devm_platform_ioremap_resource(pdev, 0);
ret = PTR_ERR_OR_ZERO(data->iomem);
if (ret) {
dev_err(&pdev->dev, "failed to get IO address\n");
goto err_put_master;
goto err_put_host;
}

/* register with the SPI framework */
ret = devm_spi_register_master(&pdev->dev, master);
ret = devm_spi_register_controller(&pdev->dev, host);
if (ret) {
dev_err(&pdev->dev, "cannot register spi master\n");
goto err_put_master;
dev_err(&pdev->dev, "cannot register spi host\n");
goto err_put_host;
}

return ret;


err_put_master:
spi_master_put(master);
err_put_host:
spi_controller_put(host);

return ret;
}
Expand All @@ -239,6 +239,6 @@ static struct platform_driver spi_lp8841_rtc_driver = {
};
module_platform_driver(spi_lp8841_rtc_driver);

MODULE_DESCRIPTION("SPI master driver for ICP DAS LP-8841 RTC");
MODULE_DESCRIPTION("SPI host driver for ICP DAS LP-8841 RTC");
MODULE_AUTHOR("Sergei Ianovich");
MODULE_LICENSE("GPL");
Loading

0 comments on commit fffae3a

Please sign in to comment.