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;
                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;
                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) {