Skip to content

Commit 0d7096c

Browse files
committed
spi: pl022: clean up some unused variables
Merge series from Nam Cao <[email protected]>: The driver was refactored in 9b2ef25 ("spi: spl022: switch to use default spi_transfer_one_message()"), and some variables are now unused because of that. Clean them up.
2 parents 4ac9ed8 + 3c49d84 commit 0d7096c

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

drivers/spi/spi-pl022.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,6 @@ struct vendor_data {
341341
* @cur_msg: Pointer to current spi_message being processed
342342
* @cur_transfer: Pointer to current spi_transfer
343343
* @cur_chip: pointer to current clients chip(assigned from controller_state)
344-
* @next_msg_cs_active: the next message in the queue has been examined
345-
* and it was found that it uses the same chip select as the previous
346-
* message, so we left it active after the previous transfer, and it's
347-
* active already.
348344
* @tx: current position in TX buffer to be read
349345
* @tx_end: end position in TX buffer to be read
350346
* @rx: current position in RX buffer to be written
@@ -361,7 +357,6 @@ struct vendor_data {
361357
* @dummypage: a dummy page used for driving data on the bus with DMA
362358
* @dma_running: indicates whether DMA is in operation
363359
* @cur_cs: current chip select index
364-
* @cur_gpiod: current chip select GPIO descriptor
365360
*/
366361
struct pl022 {
367362
struct amba_device *adev;
@@ -373,7 +368,6 @@ struct pl022 {
373368
struct pl022_ssp_controller *host_info;
374369
struct spi_transfer *cur_transfer;
375370
struct chip_data *cur_chip;
376-
bool next_msg_cs_active;
377371
void *tx;
378372
void *tx_end;
379373
void *rx;
@@ -393,7 +387,6 @@ struct pl022 {
393387
bool dma_running;
394388
#endif
395389
int cur_cs;
396-
struct gpio_desc *cur_gpiod;
397390
};
398391

399392
/**
@@ -1344,8 +1337,6 @@ static int pl022_transfer_one(struct spi_controller *host, struct spi_device *sp
13441337
/* Setup the SPI using the per chip configuration */
13451338
pl022->cur_chip = spi_get_ctldata(spi);
13461339
pl022->cur_cs = spi_get_chipselect(spi, 0);
1347-
/* This is always available but may be set to -ENOENT */
1348-
pl022->cur_gpiod = spi_get_csgpiod(spi, 0);
13491340

13501341
restore_state(pl022);
13511342
flush(pl022);

0 commit comments

Comments
 (0)