Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[karo-tx-linux.git] / drivers / input / rmi4 / rmi_spi.c

diff --git a/drivers/input/rmi4/rmi_spi.c b/drivers/input/rmi4/rmi_spi.c
index 69548d7d1f10f8f3d9fac4cc3e2e828971a7687c..d97a85907ed6651bdfa6de359e75c8bd48a3ab3f 100644 (file)
--- a/drivers/input/rmi4/rmi_spi.c
+++ b/drivers/input/rmi4/rmi_spi.c
@@ -370,7 +370,7 @@ static int rmi_spi_probe(struct spi_device *spi)
        struct rmi_spi_xport *rmi_spi;
        struct rmi_device_platform_data *pdata;
        struct rmi_device_platform_data *spi_pdata = spi->dev.platform_data;
-       int retval;
+       int error;
 
        if (spi->master->flags & SPI_MASTER_HALF_DUPLEX)
                return -EINVAL;
@@ -383,9 +383,9 @@ static int rmi_spi_probe(struct spi_device *spi)
        pdata = &rmi_spi->xport.pdata;
 
        if (spi->dev.of_node) {
-               retval = rmi_spi_of_probe(spi, pdata);
-               if (retval)
-                       return retval;
+               error = rmi_spi_of_probe(spi, pdata);
+               if (error)
+                       return error;
        } else if (spi_pdata) {
                *pdata = *spi_pdata;
        }
@@ -396,10 +396,10 @@ static int rmi_spi_probe(struct spi_device *spi)
        if (pdata->spi_data.mode)
                spi->mode = pdata->spi_data.mode;
 
-       retval = spi_setup(spi);
-       if (retval < 0) {
+       error = spi_setup(spi);
+       if (error < 0) {
                dev_err(&spi->dev, "spi_setup failed!\n");
-               return retval;
+               return error;
        }
 
        pdata->irq = spi->irq;
@@ -413,32 +413,34 @@ static int rmi_spi_probe(struct spi_device *spi)
 
        spi_set_drvdata(spi, rmi_spi);
 
-       retval = rmi_spi_manage_pools(rmi_spi, RMI_SPI_DEFAULT_XFER_BUF_SIZE);
-       if (retval)
-               return retval;
+       error = rmi_spi_manage_pools(rmi_spi, RMI_SPI_DEFAULT_XFER_BUF_SIZE);
+       if (error)
+               return error;
 
        /*
         * Setting the page to zero will (a) make sure the PSR is in a
         * known state, and (b) make sure we can talk to the device.
         */
-       retval = rmi_set_page(rmi_spi, 0);
-       if (retval) {
+       error = rmi_set_page(rmi_spi, 0);
+       if (error) {
                dev_err(&spi->dev, "Failed to set page select to 0.\n");
-               return retval;
+               return error;
        }
 
-       retval = rmi_register_transport_device(&rmi_spi->xport);
-       if (retval) {
-               dev_err(&spi->dev, "failed to register transport.\n");
-               return retval;
+       dev_info(&spi->dev, "registering SPI-connected sensor\n");
+
+       error = rmi_register_transport_device(&rmi_spi->xport);
+       if (error) {
+               dev_err(&spi->dev, "failed to register sensor: %d\n", error);
+               return error;
        }
-       retval = devm_add_action_or_reset(&spi->dev,
+
+       error = devm_add_action_or_reset(&spi->dev,
                                          rmi_spi_unregister_transport,
                                          rmi_spi);
-       if (retval)
-               return retval;
+       if (error)
+               return error;
 
-       dev_info(&spi->dev, "registered RMI SPI driver\n");
        return 0;
 }