Skip to content

Commit a3a77a4

Browse files
Yang Yingliangbroonie
authored andcommitted
spi: mtk-nor: 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-13-yangyingliang@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent e56e3de commit a3a77a4

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

drivers/spi/spi-mtk-nor.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ static void mtk_nor_adj_prg_size(struct spi_mem_op *op)
275275

276276
static int mtk_nor_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op)
277277
{
278-
struct mtk_nor *sp = spi_controller_get_devdata(mem->spi->master);
278+
struct mtk_nor *sp = spi_controller_get_devdata(mem->spi->controller);
279279

280280
if (!op->data.nbytes)
281281
return 0;
@@ -598,7 +598,7 @@ static int mtk_nor_spi_mem_prg(struct mtk_nor *sp, const struct spi_mem_op *op)
598598

599599
static int mtk_nor_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
600600
{
601-
struct mtk_nor *sp = spi_controller_get_devdata(mem->spi->master);
601+
struct mtk_nor *sp = spi_controller_get_devdata(mem->spi->controller);
602602
int ret;
603603

604604
if ((op->data.nbytes == 0) ||
@@ -639,7 +639,7 @@ static int mtk_nor_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
639639

640640
static int mtk_nor_setup(struct spi_device *spi)
641641
{
642-
struct mtk_nor *sp = spi_controller_get_devdata(spi->master);
642+
struct mtk_nor *sp = spi_controller_get_devdata(spi->controller);
643643

644644
if (spi->max_speed_hz && (spi->max_speed_hz < sp->spi_freq)) {
645645
dev_err(&spi->dev, "spi clock should be %u Hz.\n",
@@ -651,10 +651,10 @@ static int mtk_nor_setup(struct spi_device *spi)
651651
return 0;
652652
}
653653

654-
static int mtk_nor_transfer_one_message(struct spi_controller *master,
654+
static int mtk_nor_transfer_one_message(struct spi_controller *host,
655655
struct spi_message *m)
656656
{
657-
struct mtk_nor *sp = spi_controller_get_devdata(master);
657+
struct mtk_nor *sp = spi_controller_get_devdata(host);
658658
struct spi_transfer *t = NULL;
659659
unsigned long trx_len = 0;
660660
int stat = 0;
@@ -696,7 +696,7 @@ static int mtk_nor_transfer_one_message(struct spi_controller *master,
696696
m->actual_length = trx_len;
697697
msg_done:
698698
m->status = stat;
699-
spi_finalize_current_message(master);
699+
spi_finalize_current_message(host);
700700

701701
return 0;
702702
}
@@ -844,7 +844,7 @@ static int mtk_nor_probe(struct platform_device *pdev)
844844
return ret;
845845
}
846846

847-
ctlr = devm_spi_alloc_master(&pdev->dev, sizeof(*sp));
847+
ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*sp));
848848
if (!ctlr) {
849849
dev_err(&pdev->dev, "failed to allocate spi controller\n");
850850
return -ENOMEM;

0 commit comments

Comments
 (0)