!FIXUP: boot issues with latest merge from main
Bharat Nihalani [Mon, 30 Sep 2013 11:11:06 +0000 (16:11 +0530)]
Change-Id: I47e7cbfd840df5871d24664fdf15311e7ba65e23
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/280243
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Ajay Nandakumar M <anandakumarm@nvidia.com>
Tested-by: Ajay Nandakumar M <anandakumarm@nvidia.com>
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>

drivers/staging/iio/adc/palmas_gpadc.c
drivers/thermal/generic_adc_thermal.c

index 693bbc1..277aba2 100644 (file)
@@ -864,7 +864,7 @@ static int __init palmas_gpadc_init(void)
 {
        return platform_driver_register(&palmas_gpadc_driver);
 }
-subsys_initcall(palmas_gpadc_init);
+module_init(palmas_gpadc_init);
 
 static void __exit palmas_gpadc_exit(void)
 {
index acd832c..540aeee 100644 (file)
@@ -288,7 +288,7 @@ static int gadc_thermal_probe(struct platform_device *pdev)
                memcpy(drvdata->adc_temp_lookup, pdata->adc_temp_lookup,
                        pdata->lookup_table_size * sizeof(unsigned int));
 
-       drvdata->channel = iio_channel_get(dev_name(&pdev->dev),
+       drvdata->channel = iio_channel_get(&pdev->dev,
                                        pdata->iio_channel_name);
        if (IS_ERR(drvdata->channel)) {
                dev_err(&pdev->dev, "%s: Failed to get channel %s, %ld\n",