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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
index eaee546af19a..1a409c5bc9bc 100644
--- a/drivers/hwmon/ibmaem.c
+++ b/drivers/hwmon/ibmaem.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/ipmi.h>
 #include <linux/module.h>
 #include <linux/hwmon.h>
@@ -521,7 +523,7 @@ static void aem_delete(struct aem_data *data)
         aem_remove_sensors(data);
         hwmon_device_unregister(data->hwmon_dev);
         ipmi_destroy_user(data->ipmi.user);
-        dev_set_drvdata(&data->pdev->dev, NULL);
+        platform_set_drvdata(data->pdev, NULL);
         platform_device_unregister(data->pdev);
         aem_idr_put(data->id);
         kfree(data);
@@ -592,7 +594,7 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
         if (res)
                 goto ipmi_err;
 
-        dev_set_drvdata(&data->pdev->dev, data);
+        platform_set_drvdata(data->pdev, data);
 
         /* Set up IPMI interface */
         if (aem_init_ipmi_data(&data->ipmi, probe->interface,
@@ -628,7 +630,7 @@ sensor_err:
 hwmon_reg_err:
         ipmi_destroy_user(data->ipmi.user);
 ipmi_err:
-        dev_set_drvdata(&data->pdev->dev, NULL);
+        platform_set_drvdata(data->pdev, NULL);
         platform_device_unregister(data->pdev);
 dev_err:
         aem_idr_put(data->id);
@@ -725,7 +727,7 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
         if (res)
                 goto ipmi_err;
 
-        dev_set_drvdata(&data->pdev->dev, data);
+        platform_set_drvdata(data->pdev, data);
 
         /* Set up IPMI interface */
         if (aem_init_ipmi_data(&data->ipmi, probe->interface,
@@ -761,7 +763,7 @@ sensor_err:
 hwmon_reg_err:
         ipmi_destroy_user(data->ipmi.user);
 ipmi_err:
-        dev_set_drvdata(&data->pdev->dev, NULL);
+        platform_set_drvdata(data->pdev, NULL);
         platform_device_unregister(data->pdev);
 dev_err:
         aem_idr_put(data->id);
@@ -945,6 +947,7 @@ static int aem_register_sensors(struct aem_data *data,
 
         /* Set up read-only sensors */
         while (ro->label) {
+                sysfs_attr_init(&sensors->dev_attr.attr);
                 sensors->dev_attr.attr.name = ro->label;
                 sensors->dev_attr.attr.mode = S_IRUGO;
                 sensors->dev_attr.show = ro->show;
@@ -961,6 +964,7 @@ static int aem_register_sensors(struct aem_data *data,
 
         /* Set up read-write sensors */
         while (rw->label) {
+                sysfs_attr_init(&sensors->dev_attr.attr);
                 sensors->dev_attr.attr.name = rw->label;
                 sensors->dev_attr.attr.mode = S_IRUGO | S_IWUSR;
                 sensors->dev_attr.show = rw->show;
@@ -1090,7 +1094,7 @@ static int __init aem_init(void)
 
         res = driver_register(&aem_driver.driver);
         if (res) {
-                printk(KERN_ERR "Can't register aem driver\n");
+                pr_err("Can't register aem driver\n");
                 return res;
         }