Commit 5a59b9a1 authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown

spi: butterfly: switch to use modern name

Change legacy name master to modern name host or controller.

No functional changed.
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20230728093221.3312026-10-yangyingliang@huawei.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1a9e7619
...@@ -178,7 +178,7 @@ static void butterfly_attach(struct parport *p) ...@@ -178,7 +178,7 @@ static void butterfly_attach(struct parport *p)
struct pardevice *pd; struct pardevice *pd;
int status; int status;
struct butterfly *pp; struct butterfly *pp;
struct spi_master *master; struct spi_controller *host;
struct device *dev = p->physport->dev; struct device *dev = p->physport->dev;
struct pardev_cb butterfly_cb; struct pardev_cb butterfly_cb;
...@@ -189,12 +189,12 @@ static void butterfly_attach(struct parport *p) ...@@ -189,12 +189,12 @@ static void butterfly_attach(struct parport *p)
* and no way to be selective about what it binds to. * and no way to be selective about what it binds to.
*/ */
master = spi_alloc_master(dev, sizeof(*pp)); host = spi_alloc_host(dev, sizeof(*pp));
if (!master) { if (!host) {
status = -ENOMEM; status = -ENOMEM;
goto done; goto done;
} }
pp = spi_master_get_devdata(master); pp = spi_controller_get_devdata(host);
/* /*
* SPI and bitbang hookup * SPI and bitbang hookup
...@@ -202,10 +202,10 @@ static void butterfly_attach(struct parport *p) ...@@ -202,10 +202,10 @@ static void butterfly_attach(struct parport *p)
* use default setup(), cleanup(), and transfer() methods; and * use default setup(), cleanup(), and transfer() methods; and
* only bother implementing mode 0. Start it later. * only bother implementing mode 0. Start it later.
*/ */
master->bus_num = 42; host->bus_num = 42;
master->num_chipselect = 2; host->num_chipselect = 2;
pp->bitbang.master = master; pp->bitbang.master = host;
pp->bitbang.chipselect = butterfly_chipselect; pp->bitbang.chipselect = butterfly_chipselect;
pp->bitbang.txrx_word[SPI_MODE_0] = butterfly_txrx_word_mode0; pp->bitbang.txrx_word[SPI_MODE_0] = butterfly_txrx_word_mode0;
...@@ -280,7 +280,7 @@ static void butterfly_attach(struct parport *p) ...@@ -280,7 +280,7 @@ static void butterfly_attach(struct parport *p)
clean1: clean1:
parport_unregister_device(pd); parport_unregister_device(pd);
clean0: clean0:
spi_master_put(pp->bitbang.master); spi_controller_put(host);
done: done:
pr_debug("%s: butterfly probe, fail %d\n", p->name, status); pr_debug("%s: butterfly probe, fail %d\n", p->name, status);
} }
...@@ -308,7 +308,7 @@ static void butterfly_detach(struct parport *p) ...@@ -308,7 +308,7 @@ static void butterfly_detach(struct parport *p)
parport_release(pp->pd); parport_release(pp->pd);
parport_unregister_device(pp->pd); parport_unregister_device(pp->pd);
spi_master_put(pp->bitbang.master); spi_controller_put(pp->bitbang.master);
} }
static struct parport_driver butterfly_driver = { static struct parport_driver butterfly_driver = {
......
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