Skip to content

Commit

Permalink
spi: move from strlcpy with unused retval to strscpy
Browse files Browse the repository at this point in the history
Follow the advice of the below link and prefer 'strscpy' in this
subsystem. Conversion is 1:1 because the return value is not used.
Generated by a coccinelle script.

Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20220818210107.7373-1-wsa+renesas@sang-engineering.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Wolfram Sang authored and Mark Brown committed Aug 19, 2022
1 parent 9d08f70 commit 51e99de
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/spi/spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ struct spi_device *spi_new_device(struct spi_controller *ctlr,
proxy->max_speed_hz = chip->max_speed_hz;
proxy->mode = chip->mode;
proxy->irq = chip->irq;
strlcpy(proxy->modalias, chip->modalias, sizeof(proxy->modalias));
strscpy(proxy->modalias, chip->modalias, sizeof(proxy->modalias));
proxy->dev.platform_data = (void *) chip->platform_data;
proxy->controller_data = chip->controller_data;
proxy->controller_state = NULL;
Expand Down Expand Up @@ -2330,7 +2330,7 @@ struct spi_device *spi_new_ancillary_device(struct spi_device *spi,
goto err_out;
}

strlcpy(ancillary->modalias, "dummy", sizeof(ancillary->modalias));
strscpy(ancillary->modalias, "dummy", sizeof(ancillary->modalias));

/* Use provided chip-select for ancillary device */
ancillary->chip_select = chip_select;
Expand Down Expand Up @@ -2726,7 +2726,7 @@ static ssize_t slave_store(struct device *dev, struct device_attribute *attr,
if (!spi)
return -ENOMEM;

strlcpy(spi->modalias, name, sizeof(spi->modalias));
strscpy(spi->modalias, name, sizeof(spi->modalias));

rc = spi_add_device(spi);
if (rc) {
Expand Down

0 comments on commit 51e99de

Please sign in to comment.