Merge tag 'v3.16-rc6' into next

Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.

1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index f19cd97855e8..75a56968b14c 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -19,7 +19,6 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/workqueue.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
@@ -773,7 +772,6 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
 
         cs = kzalloc(sizeof(*cs), GFP_KERNEL);
         if (!cs) {
-                dev_err(&spi->dev, "could not allocate memory for controller data\n");
                 of_node_put(data_np);
                 return ERR_PTR(-ENOMEM);
         }
@@ -987,10 +985,8 @@ static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev)
         u32 temp;
 
         sci = devm_kzalloc(dev, sizeof(*sci), GFP_KERNEL);
-        if (!sci) {
-                dev_err(dev, "memory allocation for spi_info failed\n");
+        if (!sci)
                 return ERR_PTR(-ENOMEM);
-        }
 
         if (of_property_read_u32(dev->of_node, "samsung,spi-src-clk", &temp)) {
                 dev_warn(dev, "spi bus clock parent not specified, using clock at index 0 as parent\n");