arm: tegra: pluto: pass device to regulator_enable
Gaurav Batra [Tue, 30 Oct 2012 00:38:29 +0000 (17:38 -0700)]
During conflict resolutions at the time of integration,
a part of the change that took care of this problem was
over-written by another change with a different base.
Which resulted in device argument to be missing from
a few regulator calls. This patch, fixes that issue.

Bug 1166698

Change-Id: I6584968938dd343452c4660ea4e851b3523ef3ff
Signed-off-by: Gaurav Batra <gbatra@nvidia.com>
Reviewed-on: http://git-master/r/159924
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

arch/arm/mach-tegra/board-pluto-panel.c

index 99c8880..8b07332 100644 (file)
@@ -431,7 +431,7 @@ static struct tegra_dsi_out pluto_dsi = {
        .n_init_cmd = ARRAY_SIZE(dsi_init_cmd),
 };
 
-static int pluto_dsi_regulator_get(void)
+static int pluto_dsi_regulator_get(struct device *dev)
 {
        int err = 0;
 
@@ -439,7 +439,7 @@ static int pluto_dsi_regulator_get(void)
                return 0;
 
 #if PANEL_5_LG_720_1280 || PANEL_5_SHARP_1080p
-       avdd_ts_3v0 = regulator_get(NULL, "avdd_ts_3v0");
+       avdd_ts_3v0 = regulator_get(dev, "avdd_ts_3v0");
        if (IS_ERR_OR_NULL(avdd_ts_3v0)) {
                pr_err("avdd_ts_3v0 regulator get failed\n");
                err = PTR_ERR(avdd_ts_3v0);
@@ -449,7 +449,7 @@ static int pluto_dsi_regulator_get(void)
 #endif
 
 #if PANEL_5_LG_720_1280 || PANEL_4_7_JDI_720_1280
-       avdd_lcd_3v0_2v8 = regulator_get(NULL, "avdd_lcd");
+       avdd_lcd_3v0_2v8 = regulator_get(dev, "avdd_lcd");
        if (IS_ERR_OR_NULL(avdd_lcd_3v0_2v8)) {
                pr_err("avdd_lcd regulator get failed\n");
                err = PTR_ERR(avdd_lcd_3v0_2v8);
@@ -459,7 +459,7 @@ static int pluto_dsi_regulator_get(void)
 #endif
 
 #if PANEL_5_LG_720_1280 || PANEL_4_7_JDI_720_1280 || PANEL_5_SHARP_1080p
-       vdd_lcd_s_1v8 = regulator_get(NULL, "vdd_lcd_1v8_s");
+       vdd_lcd_s_1v8 = regulator_get(dev, "vdd_lcd_1v8_s");
        if (IS_ERR_OR_NULL(vdd_lcd_s_1v8)) {
                pr_err("vdd_lcd_1v8_s regulator get failed\n");
                err = PTR_ERR(vdd_lcd_s_1v8);
@@ -467,7 +467,7 @@ static int pluto_dsi_regulator_get(void)
                goto fail;
        }
 
-       vdd_sys_bl_3v7 = regulator_get(NULL, "vdd_sys_bl");
+       vdd_sys_bl_3v7 = regulator_get(dev, "vdd_sys_bl");
        if (IS_ERR_OR_NULL(vdd_sys_bl_3v7)) {
                pr_err("vdd_sys_bl regulator get failed\n");
                err = PTR_ERR(vdd_sys_bl_3v7);
@@ -519,7 +519,7 @@ static int pluto_dsi_panel_enable(struct device *dev)
 {
        int err = 0;
 
-       err = pluto_dsi_regulator_get();
+       err = pluto_dsi_regulator_get(dev);
        if (err < 0) {
                pr_err("dsi regulator get failed\n");
                goto fail;
@@ -721,7 +721,7 @@ static int pluto_hdmi_hotplug_init(struct device *dev)
 {
        int ret = 0;
        if (!pluto_hdmi_vddio) {
-               pluto_hdmi_vddio = regulator_get(NULL, "vdd_hdmi_5v0");
+               pluto_hdmi_vddio = regulator_get(dev, "vdd_hdmi_5v0");
                if (IS_ERR_OR_NULL(pluto_hdmi_vddio)) {
                        ret = PTR_ERR(pluto_hdmi_vddio);
                        pr_err("hdmi: couldn't get regulator vdd_hdmi_5v0\n");