diff options
| author | Mark Brown <broonie@kernel.org> | 2023-03-13 18:19:31 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-03-13 18:19:31 +0000 |
| commit | 4d8ff713e684ea58111a33ea7df2e7ddc30683cc (patch) | |
| tree | 1c712cbe67882f338274e77dbf92246bda96fb9f | |
| parent | 0762875674b969e35371ec5fe4b594d7a92ab364 (diff) | |
| parent | 7859ad5a401b73bf2ddfa274950b5722492c3150 (diff) | |
| download | linux-stable-4d8ff713e684ea58111a33ea7df2e7ddc30683cc.tar.gz linux-stable-4d8ff713e684ea58111a33ea7df2e7ddc30683cc.tar.bz2 linux-stable-4d8ff713e684ea58111a33ea7df2e7ddc30683cc.zip | |
spi: struct spi_device constification
Merge series from Geert Uytterhoeven <geert+renesas@glider.be>:
After noticing new cases of casting away constness, I went over all
spi_get_*() functions and their callers, and made the following changes:
1. Make all pointer parameters const where possible,
2. Remove unneeded casts, some not even related to constness.
| -rw-r--r-- | drivers/spi/spi-fsl-dspi.c | 2 | ||||
| -rw-r--r-- | drivers/spi/spi-sh-msiof.c | 4 | ||||
| -rw-r--r-- | include/linux/spi/spi.h | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index ee42285b5c52..4339485d202c 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -1068,7 +1068,7 @@ static int dspi_setup(struct spi_device *spi) static void dspi_cleanup(struct spi_device *spi) { - struct chip_data *chip = spi_get_ctldata((struct spi_device *)spi); + struct chip_data *chip = spi_get_ctldata(spi); dev_dbg(&spi->dev, "spi_device %u.%u cleanup\n", spi->controller->bus_num, spi_get_chipselect(spi, 0)); diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index ccda021ac148..9e90b4f8b357 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -587,11 +587,11 @@ static int sh_msiof_prepare_message(struct spi_controller *ctlr, u32 ss, cs_high; /* Configure pins before asserting CS */ - if (spi_get_csgpiod((struct spi_device *)spi, 0)) { + if (spi_get_csgpiod(spi, 0)) { ss = ctlr->unused_native_cs; cs_high = p->native_cs_high; } else { - ss = spi_get_chipselect((struct spi_device *)spi, 0); + ss = spi_get_chipselect(spi, 0); cs_high = !!(spi->mode & SPI_CS_HIGH); } sh_msiof_spi_set_pin_regs(p, ss, !!(spi->mode & SPI_CPOL), diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index bdb35a91b4bf..74bff5a2f53d 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -244,7 +244,7 @@ static inline void spi_dev_put(struct spi_device *spi) } /* ctldata is for the bus_controller driver's runtime state */ -static inline void *spi_get_ctldata(struct spi_device *spi) +static inline void *spi_get_ctldata(const struct spi_device *spi) { return spi->controller_state; } @@ -261,12 +261,12 @@ static inline void spi_set_drvdata(struct spi_device *spi, void *data) dev_set_drvdata(&spi->dev, data); } -static inline void *spi_get_drvdata(struct spi_device *spi) +static inline void *spi_get_drvdata(const struct spi_device *spi) { return dev_get_drvdata(&spi->dev); } -static inline u8 spi_get_chipselect(struct spi_device *spi, u8 idx) +static inline u8 spi_get_chipselect(const struct spi_device *spi, u8 idx) { return spi->chip_select; } @@ -276,7 +276,7 @@ static inline void spi_set_chipselect(struct spi_device *spi, u8 idx, u8 chipsel spi->chip_select = chipselect; } -static inline struct gpio_desc *spi_get_csgpiod(struct spi_device *spi, u8 idx) +static inline struct gpio_desc *spi_get_csgpiod(const struct spi_device *spi, u8 idx) { return spi->cs_gpiod; } |