stuartl/linux-mainline
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux synced 2025-09-14 08:36:46 +10:00
Code Issues Releases Wiki Activity

spi: sh: switch to use modern name

Browse Source 
Change legacy name master to modern name host or controller.

No functional changed.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20230818093154.1183529-22-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Yang Yingliang 2023-08-18 17:31:52 +08:00 committed by Mark Brown
parent 91a940bb10
commit 0ec6a15091
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/spi/spi-sh.c
View File

@ -72,7 +72,7 @@
struct spi_sh_data { struct spi_sh_data {
void __iomem *addr; void __iomem *addr;
int irq; int irq;
struct spi_master *master; struct spi_controller *host;
unsigned long cr1; unsigned long cr1;
wait_queue_head_t wait; wait_queue_head_t wait;
int width; int width;
@ -327,7 +327,7 @@ static int spi_sh_transfer_one_message(struct spi_controller *ctlr,
static int spi_sh_setup(struct spi_device *spi) static int spi_sh_setup(struct spi_device *spi)
{ {
struct spi_sh_data *ss = spi_master_get_devdata(spi->master); struct spi_sh_data *ss = spi_controller_get_devdata(spi->controller);
pr_debug("%s: enter\n", __func__); pr_debug("%s: enter\n", __func__);
@ -346,7 +346,7 @@ static int spi_sh_setup(struct spi_device *spi)
static void spi_sh_cleanup(struct spi_device *spi) static void spi_sh_cleanup(struct spi_device *spi)
{ {
struct spi_sh_data *ss = spi_master_get_devdata(spi->master); struct spi_sh_data *ss = spi_controller_get_devdata(spi->controller);
pr_debug("%s: enter\n", __func__); pr_debug("%s: enter\n", __func__);
@ -381,14 +381,14 @@ static void spi_sh_remove(struct platform_device *pdev)
{ {
struct spi_sh_data *ss = platform_get_drvdata(pdev); struct spi_sh_data *ss = platform_get_drvdata(pdev);
spi_unregister_master(ss->master); spi_unregister_controller(ss->host);
free_irq(ss->irq, ss); free_irq(ss->irq, ss);
} }
static int spi_sh_probe(struct platform_device *pdev) static int spi_sh_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct spi_master *master; struct spi_controller *host;
struct spi_sh_data *ss; struct spi_sh_data *ss;
int ret, irq; int ret, irq;
@ -403,13 +403,13 @@ static int spi_sh_probe(struct platform_device *pdev)
if (irq < 0) if (irq < 0)
return irq; return irq;
master = devm_spi_alloc_master(&pdev->dev, sizeof(struct spi_sh_data)); host = devm_spi_alloc_host(&pdev->dev, sizeof(struct spi_sh_data));
if (master == NULL) { if (host == NULL) {
dev_err(&pdev->dev, "spi_alloc_master error.\n"); dev_err(&pdev->dev, "devm_spi_alloc_host error.\n");
return -ENOMEM; return -ENOMEM;
} }
ss = spi_master_get_devdata(master); ss = spi_controller_get_devdata(host);
platform_set_drvdata(pdev, ss); platform_set_drvdata(pdev, ss);
switch (res->flags & IORESOURCE_MEM_TYPE_MASK) { switch (res->flags & IORESOURCE_MEM_TYPE_MASK) {
@ -424,7 +424,7 @@ static int spi_sh_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
ss->irq = irq; ss->irq = irq;
ss->master = master; ss->host = host;
ss->addr = devm_ioremap(&pdev->dev, res->start, resource_size(res)); ss->addr = devm_ioremap(&pdev->dev, res->start, resource_size(res));
if (ss->addr == NULL) { if (ss->addr == NULL) {
dev_err(&pdev->dev, "ioremap error.\n"); dev_err(&pdev->dev, "ioremap error.\n");
@ -438,15 +438,15 @@ static int spi_sh_probe(struct platform_device *pdev)
return ret; return ret;
} }
master->num_chipselect = 2; host->num_chipselect = 2;
master->bus_num = pdev->id; host->bus_num = pdev->id;
master->setup = spi_sh_setup; host->setup = spi_sh_setup;
master->transfer_one_message = spi_sh_transfer_one_message; host->transfer_one_message = spi_sh_transfer_one_message;
master->cleanup = spi_sh_cleanup; host->cleanup = spi_sh_cleanup;
ret = spi_register_master(master); ret = spi_register_controller(host);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "spi_register_master error.\n"); printk(KERN_ERR "spi_register_controller error.\n");
goto error3; goto error3;
} }