summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/hdmi.c
diff options
context:
space:
mode:
authorRhyland Klein <rklein@nvidia.com>2012-07-12 09:51:54 -0700
committerSimone Willett <swillett@nvidia.com>2012-07-13 14:58:09 -0700
commit7653853c08f7850aa229a363a23399f9a7495306 (patch)
tree0ac1a91c98ff92af2be89e0b36af6c45e3c15d46 /drivers/video/tegra/dc/hdmi.c
parent3df9f33800760738a32d5661424d68d03091be70 (diff)
video: tegra: fix compilation warning
Without the CONFIG_SWITCH enabled, there are multiple unused variable warnings that get treated as error. bug 949219 Signed-off-by: Rhyland Klein <rklein@nvidia.com> Change-Id: I39512367fa4bbd3b00a435d0d7a31cfede9e712f Reviewed-on: http://git-master/r/115428 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Sanjay Singh Rawat <srawat@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc/hdmi.c')
-rw-r--r--drivers/video/tegra/dc/hdmi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index 0795ef8ea6d2..79478ea48f83 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -1499,10 +1499,10 @@ static void tegra_dc_hdmi_resume(struct tegra_dc *dc)
tegra_nvhdcp_resume(hdmi->nvhdcp);
}
+#ifdef CONFIG_SWITCH
static ssize_t underscan_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
-#ifdef CONFIG_SWITCH
struct tegra_dc_hdmi_data *hdmi =
container_of(dev_get_drvdata(dev), struct tegra_dc_hdmi_data, hpd_switch);
@@ -1510,19 +1510,19 @@ static ssize_t underscan_show(struct device *dev,
return sprintf(buf, "%d\n", tegra_edid_underscan_supported(hdmi->edid));
else
return 0;
-#else
- return 0;
-#endif
}
static DEVICE_ATTR(underscan, S_IRUGO | S_IWUSR, underscan_show, NULL);
+#endif
static int tegra_dc_hdmi_init(struct tegra_dc *dc)
{
struct tegra_dc_hdmi_data *hdmi;
struct resource *res;
struct resource *base_res;
+#ifdef CONFIG_SWITCH
int ret;
+#endif
void __iomem *base;
struct clk *clk = NULL;
struct clk *disp1_clk = NULL;