| Message ID | 20230816094013.1275068-20-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | spi: switch to use modern name (part4) | expand |
Hi Yang, On Wed, Aug 16, 2023 at 11:43 AM Yang Yingliang <yangyingliang@huawei.com> wrote: > Change legacy name master to modern name host. > > No functional changed. > > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Thanks for your patch! > --- a/drivers/spi/spi-sh-hspi.c > +++ b/drivers/spi/spi-sh-hspi.c > @@ -137,7 +137,7 @@ static void hspi_hw_setup(struct hspi_priv *hspi, > > hspi_write(hspi, SPCR, spcr); > hspi_write(hspi, SPSR, 0x0); > - hspi_write(hspi, SPSCR, 0x21); /* master mode / CS control */ > + hspi_write(hspi, SPSCR, 0x21); /* host mode / CS control */ Please do not change this comment, as it matches the register bit documentation in Rev. 1.00 of the R-Car H1 Hardware User's Manual. Gr{oetje,eeting}s, Geert
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c index d6ffeae66ed3..9a50befdc3ea 100644 --- a/drivers/spi/spi-sh-hspi.c +++ b/drivers/spi/spi-sh-hspi.c @@ -82,7 +82,7 @@ static int hspi_status_check_timeout(struct hspi_priv *hspi, u32 mask, u32 val) } /* - * spi master function + * spi host function */ #define hspi_hw_cs_enable(hspi) hspi_hw_cs_ctrl(hspi, 0) @@ -137,7 +137,7 @@ static void hspi_hw_setup(struct hspi_priv *hspi, hspi_write(hspi, SPCR, spcr); hspi_write(hspi, SPSR, 0x0); - hspi_write(hspi, SPSCR, 0x21); /* master mode / CS control */ + hspi_write(hspi, SPSCR, 0x21); /* host mode / CS control */ } static int hspi_transfer_one_message(struct spi_controller *ctlr, @@ -224,7 +224,7 @@ static int hspi_probe(struct platform_device *pdev) return -EINVAL; } - ctlr = spi_alloc_master(&pdev->dev, sizeof(*hspi)); + ctlr = spi_alloc_host(&pdev->dev, sizeof(*hspi)); if (!ctlr) return -ENOMEM;
Change legacy name master to modern name host. No functional changed. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/spi/spi-sh-hspi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)