Merge tag 'mfd-lee-3.12-2' of git://git.linaro.org/people/ljones/mfd

mfd-lee-3.12-2

These are the final patches due for the v3.12 merge window.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

5 files changed, 31 insertions, 51 deletions

diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
index 7d1f1b08fc4b..e33e385af0a2 100644
--- a/drivers/mfd/ab8500-debugfs.c
+++ b/drivers/mfd/ab8500-debugfs.c
@@ -159,7 +159,7 @@ static struct hwreg_cfg hwreg_cfg = {
 
 static struct ab8500_prcmu_ranges *debug_ranges;
 
-struct ab8500_prcmu_ranges ab8500_debug_ranges[AB8500_NUM_BANKS] = {
+static struct ab8500_prcmu_ranges ab8500_debug_ranges[AB8500_NUM_BANKS] = {
         [0x0] = {
                 .num_ranges = 0,
                 .range = NULL,
@@ -488,7 +488,7 @@ struct ab8500_prcmu_ranges ab8500_debug_ranges[AB8500_NUM_BANKS] = {
         },
 };
 
-struct ab8500_prcmu_ranges ab8505_debug_ranges[AB8500_NUM_BANKS] = {
+static struct ab8500_prcmu_ranges ab8505_debug_ranges[AB8500_NUM_BANKS] = {
         [0x0] = {
                 .num_ranges = 0,
                 .range = NULL,
@@ -847,7 +847,7 @@ struct ab8500_prcmu_ranges ab8505_debug_ranges[AB8500_NUM_BANKS] = {
         },
 };
 
-struct ab8500_prcmu_ranges ab8540_debug_ranges[AB8500_NUM_BANKS] = {
+static struct ab8500_prcmu_ranges ab8540_debug_ranges[AB8500_NUM_BANKS] = {
         [AB8500_M_FSM_RANK] = {
                 .num_ranges = 1,
                 .range = (struct ab8500_reg_range[]) {
@@ -1377,7 +1377,7 @@ void ab8500_dump_all_banks(struct device *dev)
 
 /* Space for 500 registers. */
 #define DUMP_MAX_REGS 700
-struct ab8500_register_dump
+static struct ab8500_register_dump
 {
         u8 bank;
         u8 reg;
@@ -2800,7 +2800,13 @@ static ssize_t ab8500_subscribe_write(struct file *file,
          */
         dev_attr[irq_index] = kmalloc(sizeof(struct device_attribute),
                 GFP_KERNEL);
+        if (!dev_attr[irq_index])
+                return -ENOMEM;
+
         event_name[irq_index] = kmalloc(count, GFP_KERNEL);
+        if (!event_name[irq_index])
+                return -ENOMEM;
+
         sprintf(event_name[irq_index], "%lu", user_val);
         dev_attr[irq_index]->show = show_irq;
         dev_attr[irq_index]->store = NULL;
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 3c157faee645..f7460383d4be 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -465,7 +465,7 @@ static DEFINE_SPINLOCK(clk_mgt_lock);
 
 #define CLK_MGT_ENTRY(_name, _branch, _clk38div)[PRCMU_##_name] = \
         { (PRCM_##_name##_MGT), 0 , _branch, _clk38div}
-struct clk_mgt clk_mgt[PRCMU_NUM_REG_CLOCKS] = {
+static struct clk_mgt clk_mgt[PRCMU_NUM_REG_CLOCKS] = {
         CLK_MGT_ENTRY(SGACLK, PLL_DIV, false),
         CLK_MGT_ENTRY(UARTCLK, PLL_FIX, true),
         CLK_MGT_ENTRY(MSP02CLK, PLL_FIX, true),
@@ -2319,7 +2319,7 @@ unlock_and_return:
 /**
  * prcmu_ac_sleep_req - called when ARM no longer needs to talk to modem
  */
-void prcmu_ac_sleep_req()
+void prcmu_ac_sleep_req(void)
 {
         u32 val;
 
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index d2b8e7189907..29ee54d68512 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -114,7 +114,7 @@ struct usbhs_hcd_omap {
 };
 /*-------------------------------------------------------------------------*/
 
-const char usbhs_driver_name[] = USBHS_DRIVER_NAME;
+static const char usbhs_driver_name[] = USBHS_DRIVER_NAME;
 static u64 usbhs_dmamask = DMA_BIT_MASK(32);
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 0c1fcbc23d04..a6755ec7bd6a 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -115,11 +115,11 @@ static const struct resource timberdale_ocores_resources[] = {
         },
 };
 
-const struct max7301_platform_data timberdale_max7301_platform_data = {
+static const struct max7301_platform_data timberdale_max7301_platform_data = {
         .base = 200
 };
 
-const struct mc33880_platform_data timberdale_mc33880_platform_data = {
+static const struct mc33880_platform_data timberdale_mc33880_platform_data = {
         .base = 100
 };
 
@@ -781,7 +781,6 @@ static int timb_probe(struct pci_dev *dev,
                         priv->fw.major, priv->fw.minor, ip_setup);
                 err = -ENODEV;
                 goto err_mfd;
-                break;
         }
 
         if (err) {
@@ -869,34 +868,7 @@ static struct pci_driver timberdale_pci_driver = {
         .remove = timb_remove,
 };
 
-static int __init timberdale_init(void)
-{
-        int err;
-
-        err = pci_register_driver(&timberdale_pci_driver);
-        if (err < 0) {
-                printk(KERN_ERR
-                        "Failed to register PCI driver for %s device.\n",
-                        timberdale_pci_driver.name);
-                return -ENODEV;
-        }
-
-        printk(KERN_INFO "Driver for %s has been successfully registered.\n",
-                timberdale_pci_driver.name);
-
-        return 0;
-}
-
-static void __exit timberdale_exit(void)
-{
-        pci_unregister_driver(&timberdale_pci_driver);
-
-        printk(KERN_INFO "Driver for %s has been successfully unregistered.\n",
-                timberdale_pci_driver.name);
-}
-
-module_init(timberdale_init);
-module_exit(timberdale_exit);
+module_pci_driver(timberdale_pci_driver);
 
 MODULE_AUTHOR("Mocean Laboratories <info@mocean-labs.com>");
 MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index b7cf98f75e7c..d5966e6b5a7d 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -393,22 +393,24 @@ static struct irq_chip ucb1x00_irqchip = {
 static int ucb1x00_add_dev(struct ucb1x00 *ucb, struct ucb1x00_driver *drv)
 {
         struct ucb1x00_dev *dev;
-        int ret = -ENOMEM;
+        int ret;
 
         dev = kmalloc(sizeof(struct ucb1x00_dev), GFP_KERNEL);
-        if (dev) {
-                dev->ucb = ucb;
-                dev->drv = drv;
-
-                ret = drv->add(dev);
-
-                if (ret == 0) {
-                        list_add_tail(&dev->dev_node, &ucb->devs);
-                        list_add_tail(&dev->drv_node, &drv->devs);
-                } else {
-                        kfree(dev);
-                }
+        if (!dev)
+                return -ENOMEM;
+
+        dev->ucb = ucb;
+        dev->drv = drv;
+
+        ret = drv->add(dev);
+        if (ret) {
+                kfree(dev);
+                return ret;
         }
+
+        list_add_tail(&dev->dev_node, &ucb->devs);
+        list_add_tail(&dev->drv_node, &drv->devs);
+
         return ret;
 }