memcpy(lcd->gamma, td043mtea1_def_gamma, sizeof(lcd->gamma));
 
        lcd->vcc_reg = devm_regulator_get(&spi->dev, "vcc");
-       if (IS_ERR(lcd->vcc_reg)) {
-               dev_err(&spi->dev, "failed to get VCC regulator\n");
-               return PTR_ERR(lcd->vcc_reg);
-       }
+       if (IS_ERR(lcd->vcc_reg))
+               return dev_err_probe(&spi->dev, PTR_ERR(lcd->vcc_reg),
+                                    "failed to get VCC regulator\n");
 
        lcd->reset_gpio = devm_gpiod_get(&spi->dev, "reset", GPIOD_OUT_HIGH);
-       if (IS_ERR(lcd->reset_gpio)) {
-               dev_err(&spi->dev, "failed to get reset GPIO\n");
-               return PTR_ERR(lcd->reset_gpio);
-       }
+       if (IS_ERR(lcd->reset_gpio))
+               return dev_err_probe(&spi->dev, PTR_ERR(lcd->reset_gpio),
+                                    "failed to get reset GPIO\n");
 
        spi->bits_per_word = 16;
        spi->mode = SPI_MODE_0;