spi: mchp-pci1xxxx: 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/20230818093154.1183529-3-yangyingliang@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
08e6c5038f
Коммит
f9977bb164
|
@ -65,7 +65,7 @@ struct pci1xxxx_spi_internal {
|
|||
bool spi_xfer_in_progress;
|
||||
int irq;
|
||||
struct completion spi_xfer_done;
|
||||
struct spi_master *spi_host;
|
||||
struct spi_controller *spi_host;
|
||||
struct pci1xxxx_spi *parent;
|
||||
struct {
|
||||
unsigned int dev_sel : 3;
|
||||
|
@ -250,7 +250,7 @@ static int pci1xxxx_spi_probe(struct pci_dev *pdev, const struct pci_device_id *
|
|||
struct pci1xxxx_spi_internal *spi_sub_ptr;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct pci1xxxx_spi *spi_bus;
|
||||
struct spi_master *spi_host;
|
||||
struct spi_controller *spi_host;
|
||||
u32 regval;
|
||||
int ret;
|
||||
|
||||
|
@ -276,7 +276,7 @@ static int pci1xxxx_spi_probe(struct pci_dev *pdev, const struct pci_device_id *
|
|||
sizeof(struct pci1xxxx_spi_internal),
|
||||
GFP_KERNEL);
|
||||
spi_sub_ptr = spi_bus->spi_int[iter];
|
||||
spi_sub_ptr->spi_host = devm_spi_alloc_master(dev, sizeof(struct spi_master));
|
||||
spi_sub_ptr->spi_host = devm_spi_alloc_host(dev, sizeof(struct spi_controller));
|
||||
if (!spi_sub_ptr->spi_host)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -366,8 +366,8 @@ static int pci1xxxx_spi_probe(struct pci_dev *pdev, const struct pci_device_id *
|
|||
spi_host->max_speed_hz = PCI1XXXX_SPI_MAX_CLOCK_HZ;
|
||||
spi_host->min_speed_hz = PCI1XXXX_SPI_MIN_CLOCK_HZ;
|
||||
spi_host->flags = SPI_CONTROLLER_MUST_TX;
|
||||
spi_master_set_devdata(spi_host, spi_sub_ptr);
|
||||
ret = devm_spi_register_master(dev, spi_host);
|
||||
spi_controller_set_devdata(spi_host, spi_sub_ptr);
|
||||
ret = devm_spi_register_controller(dev, spi_host);
|
||||
if (ret)
|
||||
goto error;
|
||||
}
|
||||
|
@ -415,7 +415,7 @@ static int pci1xxxx_spi_resume(struct device *dev)
|
|||
|
||||
for (iter = 0; iter < spi_ptr->total_hw_instances; iter++) {
|
||||
spi_sub_ptr = spi_ptr->spi_int[iter];
|
||||
spi_master_resume(spi_sub_ptr->spi_host);
|
||||
spi_controller_resume(spi_sub_ptr->spi_host);
|
||||
writel(regval, spi_ptr->reg_base +
|
||||
SPI_MST_EVENT_MASK_REG_OFFSET(iter));
|
||||
|
||||
|
@ -441,7 +441,7 @@ static int pci1xxxx_spi_suspend(struct device *dev)
|
|||
|
||||
/* Store existing config before suspend */
|
||||
store_restore_config(spi_ptr, spi_sub_ptr, iter, 1);
|
||||
spi_master_suspend(spi_sub_ptr->spi_host);
|
||||
spi_controller_suspend(spi_sub_ptr->spi_host);
|
||||
writel(reg1, spi_ptr->reg_base +
|
||||
SPI_MST_EVENT_MASK_REG_OFFSET(iter));
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче