Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
media: netup_unidvb: Follow renaming of SPI "master" to "controller"
In commit 8caab75fd2c2 ("spi: Generalize SPI "master" to "controller"")
some functions and struct members were renamed. To not break all drivers
compatibility macros were provided.
To be able to remove these compatibility macros push the renaming into
this driver.
Acked-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/c37fceef8c631c5b49538f3f143573b605fc2c24.1707324794.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Uwe Kleine-König
and committed by
Mark Brown
cfa13a64
2c2f93fb
+24
-24
+24
-24
drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
+24
-24
drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
···
35
35
36
36
struct netup_spi {
37
37
struct device *dev;
38
-
struct spi_master *master;
38
+
struct spi_controller *ctlr;
39
39
struct netup_spi_regs __iomem *regs;
40
40
u8 __iomem *mmio;
41
41
spinlock_t lock;
···
78
78
reg = readw(&spi->regs->control_stat);
79
79
if (!(reg & NETUP_SPI_CTRL_IRQ)) {
80
80
spin_unlock_irqrestore(&spi->lock, flags);
81
-
dev_dbg(&spi->master->dev,
81
+
dev_dbg(&spi->ctlr->dev,
82
82
"%s(): not mine interrupt\n", __func__);
83
83
return IRQ_NONE;
84
84
}
···
88
88
spi->state = SPI_STATE_DONE;
89
89
wake_up(&spi->waitq);
90
90
spin_unlock_irqrestore(&spi->lock, flags);
91
-
dev_dbg(&spi->master->dev,
91
+
dev_dbg(&spi->ctlr->dev,
92
92
"%s(): SPI interrupt handled\n", __func__);
93
93
return IRQ_HANDLED;
94
94
}
95
95
96
-
static int netup_spi_transfer(struct spi_master *master,
96
+
static int netup_spi_transfer(struct spi_controller *ctlr,
97
97
struct spi_message *msg)
98
98
{
99
-
struct netup_spi *spi = spi_master_get_devdata(master);
99
+
struct netup_spi *spi = spi_controller_get_devdata(ctlr);
100
100
struct spi_transfer *t;
101
101
int result = 0;
102
102
u32 tr_size;
···
131
131
NETUP_SPI_CTRL_START |
132
132
(frag_last ? NETUP_SPI_CTRL_LAST_CS : 0),
133
133
&spi->regs->control_stat);
134
-
dev_dbg(&spi->master->dev,
134
+
dev_dbg(&spi->ctlr->dev,
135
135
"%s(): control_stat 0x%04x\n",
136
136
__func__, readw(&spi->regs->control_stat));
137
137
wait_event_timeout(spi->waitq,
···
144
144
}
145
145
} else {
146
146
if (spi->state == SPI_STATE_START) {
147
-
dev_dbg(&spi->master->dev,
147
+
dev_dbg(&spi->ctlr->dev,
148
148
"%s(): transfer timeout\n",
149
149
__func__);
150
150
} else {
151
-
dev_dbg(&spi->master->dev,
151
+
dev_dbg(&spi->ctlr->dev,
152
152
"%s(): invalid state %d\n",
153
153
__func__, spi->state);
154
154
}
···
161
161
}
162
162
done:
163
163
msg->status = result;
164
-
spi_finalize_current_message(master);
164
+
spi_finalize_current_message(ctlr);
165
165
return result;
166
166
}
167
167
···
172
172
173
173
int netup_spi_init(struct netup_unidvb_dev *ndev)
174
174
{
175
-
struct spi_master *master;
175
+
struct spi_controller *ctlr;
176
176
struct netup_spi *nspi;
177
177
178
-
master = devm_spi_alloc_master(&ndev->pci_dev->dev,
179
-
sizeof(struct netup_spi));
180
-
if (!master) {
178
+
ctlr = devm_spi_alloc_master(&ndev->pci_dev->dev,
179
+
sizeof(struct netup_spi));
180
+
if (!ctlr) {
181
181
dev_err(&ndev->pci_dev->dev,
182
182
"%s(): unable to alloc SPI master\n", __func__);
183
183
return -EINVAL;
184
184
}
185
-
nspi = spi_master_get_devdata(master);
186
-
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST;
187
-
master->bus_num = -1;
188
-
master->num_chipselect = 1;
189
-
master->transfer_one_message = netup_spi_transfer;
190
-
master->setup = netup_spi_setup;
185
+
nspi = spi_controller_get_devdata(ctlr);
186
+
ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST;
187
+
ctlr->bus_num = -1;
188
+
ctlr->num_chipselect = 1;
189
+
ctlr->transfer_one_message = netup_spi_transfer;
190
+
ctlr->setup = netup_spi_setup;
191
191
spin_lock_init(&nspi->lock);
192
192
init_waitqueue_head(&nspi->waitq);
193
-
nspi->master = master;
193
+
nspi->ctlr = ctlr;
194
194
nspi->regs = (struct netup_spi_regs __iomem *)(ndev->bmmio0 + 0x4000);
195
195
writew(2, &nspi->regs->clock_divider);
196
196
writew(NETUP_UNIDVB_IRQ_SPI, ndev->bmmio0 + REG_IMASK_SET);
197
197
ndev->spi = nspi;
198
-
if (spi_register_master(master)) {
198
+
if (spi_register_controller(ctlr)) {
199
199
ndev->spi = NULL;
200
200
dev_err(&ndev->pci_dev->dev,
201
201
"%s(): unable to register SPI bus\n", __func__);
···
207
207
ndev->pci_bus,
208
208
ndev->pci_slot,
209
209
ndev->pci_func);
210
-
if (!spi_new_device(master, &netup_spi_board)) {
211
-
spi_unregister_master(master);
210
+
if (!spi_new_device(ctlr, &netup_spi_board)) {
211
+
spi_unregister_controller(ctlr);
212
212
ndev->spi = NULL;
213
213
dev_err(&ndev->pci_dev->dev,
214
214
"%s(): unable to create SPI device\n", __func__);
···
227
227
if (!spi)
228
228
return;
229
229
230
-
spi_unregister_master(spi->master);
230
+
spi_unregister_controller(spi->ctlr);
231
231
spin_lock_irqsave(&spi->lock, flags);
232
232
reg = readw(&spi->regs->control_stat);
233
233
writew(reg | NETUP_SPI_CTRL_IRQ, &spi->regs->control_stat);