Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 78 insertions, 70 deletions

diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 66379b413906..a20e1c41bed2 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -19,6 +19,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
+#include <linux/mfd/core.h>
 #include <linux/mfd/abx500.h>
 
 /* These are the only registers inside AB3100 used in this main file */
@@ -146,7 +147,7 @@ static int ab3100_set_test_register_interruptible(struct ab3100 *ab3100,
 }
 
 static int ab3100_get_register_interruptible(struct ab3100 *ab3100,
-        u8 reg, u8 *regval)
+                                             u8 reg, u8 *regval)
 {
         int err;
 
@@ -202,7 +203,7 @@ static int ab3100_get_register_interruptible(struct ab3100 *ab3100,
 }
 
 static int get_register_interruptible(struct device *dev, u8 bank, u8 reg,
-        u8 *value)
+                                      u8 *value)
 {
         struct ab3100 *ab3100 = dev_get_drvdata(dev->parent);
 
@@ -583,6 +584,7 @@ static ssize_t ab3100_get_set_reg(struct file *file,
 static const struct file_operations ab3100_get_set_reg_fops = {
         .open = ab3100_get_set_reg_open_file,
         .write = ab3100_get_set_reg,
+        .llseek = noop_llseek,
 };
 
 static struct dentry *ab3100_dir;
@@ -611,7 +613,7 @@ static void ab3100_setup_debugfs(struct ab3100 *ab3100)
         ab3100_get_priv.ab3100 = ab3100;
         ab3100_get_priv.mode = false;
         ab3100_get_reg_file = debugfs_create_file("get_reg",
-                                S_IWUGO, ab3100_dir, &ab3100_get_priv,
+                                S_IWUSR, ab3100_dir, &ab3100_get_priv,
                                 &ab3100_get_set_reg_fops);
         if (!ab3100_get_reg_file) {
                 err = -ENOMEM;
@@ -621,7 +623,7 @@ static void ab3100_setup_debugfs(struct ab3100 *ab3100)
         ab3100_set_priv.ab3100 = ab3100;
         ab3100_set_priv.mode = true;
         ab3100_set_reg_file = debugfs_create_file("set_reg",
-                                S_IWUGO, ab3100_dir, &ab3100_set_priv,
+                                S_IWUSR, ab3100_dir, &ab3100_set_priv,
                                 &ab3100_get_set_reg_fops);
         if (!ab3100_set_reg_file) {
                 err = -ENOMEM;
@@ -665,7 +667,7 @@ struct ab3100_init_setting {
         u8 setting;
 };
 
-static const struct ab3100_init_setting __initconst
+static const struct ab3100_init_setting __devinitconst
 ab3100_init_settings[] = {
         {
                 .abreg = AB3100_MCA,
@@ -712,7 +714,7 @@ ab3100_init_settings[] = {
         },
 };
 
-static int __init ab3100_setup(struct ab3100 *ab3100)
+static int __devinit ab3100_setup(struct ab3100 *ab3100)
 {
         int err = 0;
         int i;
@@ -742,52 +744,64 @@ static int __init ab3100_setup(struct ab3100 *ab3100)
         return err;
 }
 
-/*
- * Here we define all the platform devices that appear
- * as children of the AB3100. These are regular platform
- * devices with the IORESOURCE_IO .start and .end set
- * to correspond to the internal AB3100 register range
- * mapping to the corresponding subdevice.
- */
-
-#define AB3100_DEVICE(devname, devid)                           \
-static struct platform_device ab3100_##devname##_device = {     \
-        .name           = devid,                                \
-        .id             = -1,                                   \
-}
-
-/* This lists all the subdevices */
-AB3100_DEVICE(dac, "ab3100-dac");
-AB3100_DEVICE(leds, "ab3100-leds");
-AB3100_DEVICE(power, "ab3100-power");
-AB3100_DEVICE(regulators, "ab3100-regulators");
-AB3100_DEVICE(sim, "ab3100-sim");
-AB3100_DEVICE(uart, "ab3100-uart");
-AB3100_DEVICE(rtc, "ab3100-rtc");
-AB3100_DEVICE(charger, "ab3100-charger");
-AB3100_DEVICE(boost, "ab3100-boost");
-AB3100_DEVICE(adc, "ab3100-adc");
-AB3100_DEVICE(fuelgauge, "ab3100-fuelgauge");
-AB3100_DEVICE(vibrator, "ab3100-vibrator");
-AB3100_DEVICE(otp, "ab3100-otp");
-AB3100_DEVICE(codec, "ab3100-codec");
-
-static struct platform_device *
-ab3100_platform_devs[] = {
-        &ab3100_dac_device,
-        &ab3100_leds_device,
-        &ab3100_power_device,
-        &ab3100_regulators_device,
-        &ab3100_sim_device,
-        &ab3100_uart_device,
-        &ab3100_rtc_device,
-        &ab3100_charger_device,
-        &ab3100_boost_device,
-        &ab3100_adc_device,
-        &ab3100_fuelgauge_device,
-        &ab3100_vibrator_device,
-        &ab3100_otp_device,
-        &ab3100_codec_device,
+/* The subdevices of the AB3100 */
+static struct mfd_cell ab3100_devs[] = {
+        {
+                .name = "ab3100-dac",
+                .id = -1,
+        },
+        {
+                .name = "ab3100-leds",
+                .id = -1,
+        },
+        {
+                .name = "ab3100-power",
+                .id = -1,
+        },
+        {
+                .name = "ab3100-regulators",
+                .id = -1,
+        },
+        {
+                .name = "ab3100-sim",
+                .id = -1,
+        },
+        {
+                .name = "ab3100-uart",
+                .id = -1,
+        },
+        {
+                .name = "ab3100-rtc",
+                .id = -1,
+        },
+        {
+                .name = "ab3100-charger",
+                .id = -1,
+        },
+        {
+                .name = "ab3100-boost",
+                .id = -1,
+        },
+        {
+                .name = "ab3100-adc",
+                .id = -1,
+        },
+        {
+                .name = "ab3100-fuelgauge",
+                .id = -1,
+        },
+        {
+                .name = "ab3100-vibrator",
+                .id = -1,
+        },
+        {
+                .name = "ab3100-otp",
+                .id = -1,
+        },
+        {
+                .name = "ab3100-codec",
+                .id = -1,
+        },
 };
 
 struct ab_family_id {
@@ -795,7 +809,7 @@ struct ab_family_id {
         char    *name;
 };
 
-static const struct ab_family_id ids[] __initdata = {
+static const struct ab_family_id ids[] __devinitdata = {
         /* AB3100 */
         {
                 .id = 0xc0,
@@ -849,8 +863,8 @@ static const struct ab_family_id ids[] __initdata = {
         },
 };
 
-static int __init ab3100_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int __devinit ab3100_probe(struct i2c_client *client,
+                                  const struct i2c_device_id *id)
 {
         struct ab3100 *ab3100;
         struct ab3100_platform_data *ab3100_plf_data =
@@ -934,18 +948,14 @@ static int __init ab3100_probe(struct i2c_client *client,
         if (err)
                 goto exit_no_ops;
 
-        /* Set parent and a pointer back to the container in device data */
-        for (i = 0; i < ARRAY_SIZE(ab3100_platform_devs); i++) {
-                ab3100_platform_devs[i]->dev.parent =
-                        &client->dev;
-                ab3100_platform_devs[i]->dev.platform_data =
-                        ab3100_plf_data;
-                platform_set_drvdata(ab3100_platform_devs[i], ab3100);
+        /* Set up and register the platform devices. */
+        for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++) {
+                ab3100_devs[i].platform_data = ab3100_plf_data;
+                ab3100_devs[i].pdata_size = sizeof(struct ab3100_platform_data);
         }
 
-        /* Register the platform devices */
-        platform_add_devices(ab3100_platform_devs,
-                             ARRAY_SIZE(ab3100_platform_devs));
+        err = mfd_add_devices(&client->dev, 0, ab3100_devs,
+                ARRAY_SIZE(ab3100_devs), NULL, 0);
 
         ab3100_setup_debugfs(ab3100);
 
@@ -961,14 +971,12 @@ static int __init ab3100_probe(struct i2c_client *client,
         return err;
 }
 
-static int __exit ab3100_remove(struct i2c_client *client)
+static int __devexit ab3100_remove(struct i2c_client *client)
 {
         struct ab3100 *ab3100 = i2c_get_clientdata(client);
-        int i;
 
         /* Unregister subdevices */
-        for (i = 0; i < ARRAY_SIZE(ab3100_platform_devs); i++)
-                platform_device_unregister(ab3100_platform_devs[i]);
+        mfd_remove_devices(&client->dev);
 
         ab3100_remove_debugfs();
         i2c_unregister_device(ab3100->testreg_client);
@@ -995,7 +1003,7 @@ static struct i2c_driver ab3100_driver = {
         },
         .id_table       = ab3100_id,
         .probe          = ab3100_probe,
-        .remove         = __exit_p(ab3100_remove),
+        .remove         = __devexit_p(ab3100_remove),
 };
 
 static int __init ab3100_i2c_init(void)