Merge remote-tracking branch 'spi/topic/core' into spi-next

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index e691e281e3a2561f1bb759df3aae13528ba082d2..e6f076d5ffd5bb65c4c4fcc38efce1342ab5adec 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -345,14 +345,12 @@ static DEFINE_MUTEX(board_lock);
 struct spi_device *spi_alloc_device(struct spi_master *master)
 {
        struct spi_device       *spi;
-       struct device           *dev = master->dev.parent;
 
        if (!spi_master_get(master))
                return NULL;
 
        spi = kzalloc(sizeof(*spi), GFP_KERNEL);
        if (!spi) {
-               dev_err(dev, "cannot alloc spi_device\n");
                spi_master_put(master);
                return NULL;
        }