Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

spi: mpc512x-psc: 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-8-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Yang Yingliang and committed by
Mark Brown
a21db739 8f8bf52e

+27 -27
+27 -27
drivers/spi/spi-mpc512x-psc.c
··· 85 85 static void mpc512x_psc_spi_activate_cs(struct spi_device *spi) 86 86 { 87 87 struct mpc512x_psc_spi_cs *cs = spi->controller_state; 88 - struct mpc512x_psc_spi *mps = spi_master_get_devdata(spi->master); 88 + struct mpc512x_psc_spi *mps = spi_controller_get_devdata(spi->controller); 89 89 u32 sicr; 90 90 u32 ccr; 91 91 int speed; ··· 143 143 static int mpc512x_psc_spi_transfer_rxtx(struct spi_device *spi, 144 144 struct spi_transfer *t) 145 145 { 146 - struct mpc512x_psc_spi *mps = spi_master_get_devdata(spi->master); 146 + struct mpc512x_psc_spi *mps = spi_controller_get_devdata(spi->controller); 147 147 struct mpc512x_psc_fifo __iomem *fifo = mps->fifo; 148 148 size_t tx_len = t->len; 149 149 size_t rx_len = t->len; ··· 280 280 return 0; 281 281 } 282 282 283 - static int mpc512x_psc_spi_msg_xfer(struct spi_master *master, 283 + static int mpc512x_psc_spi_msg_xfer(struct spi_controller *host, 284 284 struct spi_message *m) 285 285 { 286 286 struct spi_device *spi; ··· 320 320 321 321 mpc512x_psc_spi_transfer_setup(spi, NULL); 322 322 323 - spi_finalize_current_message(master); 323 + spi_finalize_current_message(host); 324 324 return status; 325 325 } 326 326 327 - static int mpc512x_psc_spi_prep_xfer_hw(struct spi_master *master) 327 + static int mpc512x_psc_spi_prep_xfer_hw(struct spi_controller *host) 328 328 { 329 - struct mpc512x_psc_spi *mps = spi_master_get_devdata(master); 329 + struct mpc512x_psc_spi *mps = spi_controller_get_devdata(host); 330 330 331 - dev_dbg(&master->dev, "%s()\n", __func__); 331 + dev_dbg(&host->dev, "%s()\n", __func__); 332 332 333 333 /* Zero MR2 */ 334 334 in_8(psc_addr(mps, mr2)); ··· 340 340 return 0; 341 341 } 342 342 343 - static int mpc512x_psc_spi_unprep_xfer_hw(struct spi_master *master) 343 + static int mpc512x_psc_spi_unprep_xfer_hw(struct spi_controller *host) 344 344 { 345 - struct mpc512x_psc_spi *mps = spi_master_get_devdata(master); 345 + struct mpc512x_psc_spi *mps = spi_controller_get_devdata(host); 346 346 struct mpc512x_psc_fifo __iomem *fifo = mps->fifo; 347 347 348 - dev_dbg(&master->dev, "%s()\n", __func__); 348 + dev_dbg(&host->dev, "%s()\n", __func__); 349 349 350 350 /* disable transmitter/receiver and fifo interrupt */ 351 351 out_8(psc_addr(mps, command), MPC52xx_PSC_TX_DISABLE | MPC52xx_PSC_RX_DISABLE); ··· 380 380 kfree(spi->controller_state); 381 381 } 382 382 383 - static int mpc512x_psc_spi_port_config(struct spi_master *master, 383 + static int mpc512x_psc_spi_port_config(struct spi_controller *host, 384 384 struct mpc512x_psc_spi *mps) 385 385 { 386 386 struct mpc512x_psc_fifo __iomem *fifo = mps->fifo; ··· 408 408 sicr = 0x01000000 | /* SIM = 0001 -- 8 bit */ 409 409 0x00800000 | /* GenClk = 1 -- internal clk */ 410 410 0x00008000 | /* SPI = 1 */ 411 - 0x00004000 | /* MSTR = 1 -- SPI master */ 411 + 0x00004000 | /* MSTR = 1 -- SPI host */ 412 412 0x00000800; /* UseEOF = 1 -- SS low until EOF */ 413 413 414 414 out_be32(psc_addr(mps, sicr), sicr); ··· 459 459 { 460 460 struct device *dev = &pdev->dev; 461 461 struct mpc512x_psc_spi *mps; 462 - struct spi_master *master; 462 + struct spi_controller *host; 463 463 int ret; 464 464 void *tempp; 465 465 struct clk *clk; 466 466 467 - master = devm_spi_alloc_master(dev, sizeof(*mps)); 468 - if (master == NULL) 467 + host = devm_spi_alloc_host(dev, sizeof(*mps)); 468 + if (host == NULL) 469 469 return -ENOMEM; 470 470 471 - dev_set_drvdata(dev, master); 472 - mps = spi_master_get_devdata(master); 471 + dev_set_drvdata(dev, host); 472 + mps = spi_controller_get_devdata(host); 473 473 mps->type = (int)device_get_match_data(dev); 474 474 475 - master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST; 476 - master->setup = mpc512x_psc_spi_setup; 477 - master->prepare_transfer_hardware = mpc512x_psc_spi_prep_xfer_hw; 478 - master->transfer_one_message = mpc512x_psc_spi_msg_xfer; 479 - master->unprepare_transfer_hardware = mpc512x_psc_spi_unprep_xfer_hw; 480 - master->use_gpio_descriptors = true; 481 - master->cleanup = mpc512x_psc_spi_cleanup; 475 + host->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST; 476 + host->setup = mpc512x_psc_spi_setup; 477 + host->prepare_transfer_hardware = mpc512x_psc_spi_prep_xfer_hw; 478 + host->transfer_one_message = mpc512x_psc_spi_msg_xfer; 479 + host->unprepare_transfer_hardware = mpc512x_psc_spi_unprep_xfer_hw; 480 + host->use_gpio_descriptors = true; 481 + host->cleanup = mpc512x_psc_spi_cleanup; 482 482 483 - device_set_node(&master->dev, dev_fwnode(dev)); 483 + device_set_node(&host->dev, dev_fwnode(dev)); 484 484 485 485 tempp = devm_platform_get_and_ioremap_resource(pdev, 0, NULL); 486 486 if (IS_ERR(tempp)) ··· 509 509 if (IS_ERR(clk)) 510 510 return PTR_ERR(clk); 511 511 512 - ret = mpc512x_psc_spi_port_config(master, mps); 512 + ret = mpc512x_psc_spi_port_config(host, mps); 513 513 if (ret < 0) 514 514 return ret; 515 515 516 - return devm_spi_register_master(dev, master); 516 + return devm_spi_register_controller(dev, host); 517 517 } 518 518 519 519 static const struct of_device_id mpc512x_psc_spi_of_match[] = {