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

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / arizona-spi.c

diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c
index 850a63a3235e117bc1b346bbd262fa813af6246b..befbc89bfd3456c210d736d2ad295c646a2bd4fc 100644 (file)
--- a/drivers/mfd/arizona-spi.c
+++ b/drivers/mfd/arizona-spi.c
@@ -47,8 +47,7 @@ static int arizona_spi_probe(struct spi_device *spi)
                        regmap_config = &wm5110_spi_regmap;
                break;
        default:
-               dev_err(&spi->dev, "Unknown device type %ld\n",
-                       id->driver_data);
+               dev_err(&spi->dev, "Unknown device type %ld\n", type);
                return -EINVAL;
        }
 
@@ -70,7 +69,7 @@ static int arizona_spi_probe(struct spi_device *spi)
                return ret;
        }
 
-       arizona->type = id->driver_data;
+       arizona->type = type;
        arizona->dev = &spi->dev;
        arizona->irq = spi->irq;
 
@@ -97,7 +96,6 @@ MODULE_DEVICE_TABLE(spi, arizona_spi_ids);
 static struct spi_driver arizona_spi_driver = {
        .driver = {
                .name   = "arizona",
-               .owner  = THIS_MODULE,
                .pm     = &arizona_pm_ops,
                .of_match_table = of_match_ptr(arizona_of_match),
        },