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

spi: spi-altera-dfl: 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/20221229103837.4192759-3-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Yang Yingliang and committed by
Mark Brown
ec168190 26c48aea

+18 -18
+18 -18
drivers/spi/spi-altera-dfl.c
··· 104 104 .reg_read = indirect_bus_reg_read, 105 105 }; 106 106 107 - static void config_spi_master(void __iomem *base, struct spi_master *master) 107 + static void config_spi_host(void __iomem *base, struct spi_controller *host) 108 108 { 109 109 u64 v; 110 110 111 111 v = readq(base + SPI_CORE_PARAMETER); 112 112 113 - master->mode_bits = SPI_CS_HIGH; 113 + host->mode_bits = SPI_CS_HIGH; 114 114 if (FIELD_GET(CLK_POLARITY, v)) 115 - master->mode_bits |= SPI_CPOL; 115 + host->mode_bits |= SPI_CPOL; 116 116 if (FIELD_GET(CLK_PHASE, v)) 117 - master->mode_bits |= SPI_CPHA; 117 + host->mode_bits |= SPI_CPHA; 118 118 119 - master->num_chipselect = FIELD_GET(NUM_CHIPSELECT, v); 120 - master->bits_per_word_mask = 119 + host->num_chipselect = FIELD_GET(NUM_CHIPSELECT, v); 120 + host->bits_per_word_mask = 121 121 SPI_BPW_RANGE_MASK(1, FIELD_GET(DATA_WIDTH, v)); 122 122 } 123 123 ··· 125 125 { 126 126 struct spi_board_info board_info = { 0 }; 127 127 struct device *dev = &dfl_dev->dev; 128 - struct spi_master *master; 128 + struct spi_controller *host; 129 129 struct altera_spi *hw; 130 130 void __iomem *base; 131 131 int err; 132 132 133 - master = devm_spi_alloc_master(dev, sizeof(struct altera_spi)); 134 - if (!master) 133 + host = devm_spi_alloc_host(dev, sizeof(struct altera_spi)); 134 + if (!host) 135 135 return -ENOMEM; 136 136 137 - master->bus_num = -1; 137 + host->bus_num = -1; 138 138 139 - hw = spi_master_get_devdata(master); 139 + hw = spi_controller_get_devdata(host); 140 140 141 141 hw->dev = dev; 142 142 ··· 145 145 if (IS_ERR(base)) 146 146 return PTR_ERR(base); 147 147 148 - config_spi_master(base, master); 148 + config_spi_host(base, host); 149 149 dev_dbg(dev, "%s cs %u bpm 0x%x mode 0x%x\n", __func__, 150 - master->num_chipselect, master->bits_per_word_mask, 151 - master->mode_bits); 150 + host->num_chipselect, host->bits_per_word_mask, 151 + host->mode_bits); 152 152 153 153 hw->regmap = devm_regmap_init(dev, NULL, base, &indirect_regbus_cfg); 154 154 if (IS_ERR(hw->regmap)) ··· 156 156 157 157 hw->irq = -EINVAL; 158 158 159 - altera_spi_init_host(master); 159 + altera_spi_init_host(host); 160 160 161 - err = devm_spi_register_master(dev, master); 161 + err = devm_spi_register_controller(dev, host); 162 162 if (err) 163 - return dev_err_probe(dev, err, "%s failed to register spi master\n", 163 + return dev_err_probe(dev, err, "%s failed to register spi host\n", 164 164 __func__); 165 165 166 166 if (dfl_dev->revision == FME_FEATURE_REV_MAX10_SPI_N5010) ··· 172 172 board_info.bus_num = 0; 173 173 board_info.chip_select = 0; 174 174 175 - if (!spi_new_device(master, &board_info)) { 175 + if (!spi_new_device(host, &board_info)) { 176 176 dev_err(dev, "%s failed to create SPI device: %s\n", 177 177 __func__, board_info.modalias); 178 178 }