public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] OMAPDSS: HDMI: Rid hw_params of extra argument
@ 2011-11-22 15:23 Jassi Brar
  2011-11-23 11:43 ` Tomi Valkeinen
  0 siblings, 1 reply; 2+ messages in thread
From: Jassi Brar @ 2011-11-22 15:23 UTC (permalink / raw)
  To: linux-omap; +Cc: mythripk, tomi.valkeinen, Jassi Brar

Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
---
 drivers/video/omap2/dss/hdmi.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 3262f0f..d3eae98 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -554,8 +554,7 @@ void omapdss_hdmi_display_disable(struct omap_dss_device *dssdev)
 #if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
 	defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
 
-static int hdmi_audio_hw_params(struct hdmi_ip_data *ip_data,
-					struct snd_pcm_substream *substream,
+static int hdmi_audio_hw_params(struct snd_pcm_substream *substream,
 				    struct snd_pcm_hw_params *params,
 				    struct snd_soc_dai *dai)
 {
@@ -609,7 +608,7 @@ static int hdmi_audio_hw_params(struct hdmi_ip_data *ip_data,
 		return -EINVAL;
 	}
 
-	err = hdmi_config_audio_acr(ip_data, params_rate(params), &n, &cts);
+	err = hdmi_config_audio_acr(&hdmi.ip_data, params_rate(params), &n, &cts);
 	if (err < 0)
 		return err;
 
@@ -625,8 +624,8 @@ static int hdmi_audio_hw_params(struct hdmi_ip_data *ip_data,
 	audio_dma.mode = HDMI_AUDIO_TRANSF_DMA;
 	audio_dma.fifo_threshold = 0x20; /* in number of samples */
 
-	hdmi_wp_audio_config_dma(ip_data, &audio_dma);
-	hdmi_wp_audio_config_format(ip_data, &audio_format);
+	hdmi_wp_audio_config_dma(&hdmi.ip_data, &audio_dma);
+	hdmi_wp_audio_config_format(&hdmi.ip_data, &audio_format);
 
 	/*
 	 * I2S config
@@ -670,7 +669,7 @@ static int hdmi_audio_hw_params(struct hdmi_ip_data *ip_data,
 	/* Use parallel audio interface */
 	core_cfg.en_parallel_aud_input = true;
 
-	hdmi_core_audio_config(ip_data, &core_cfg);
+	hdmi_core_audio_config(&hdmi.ip_data, &core_cfg);
 
 	/*
 	 * Configure packet
@@ -684,7 +683,7 @@ static int hdmi_audio_hw_params(struct hdmi_ip_data *ip_data,
 	aud_if_cfg.db5_downmix_inh = false;
 	aud_if_cfg.db5_lsv = 0;
 
-	hdmi_core_audio_infoframe_config(ip_data, &aud_if_cfg);
+	hdmi_core_audio_infoframe_config(&hdmi.ip_data, &aud_if_cfg);
 	return 0;
 }
 
-- 
1.7.4.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-11-23 11:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-22 15:23 [PATCH 1/2] OMAPDSS: HDMI: Rid hw_params of extra argument Jassi Brar
2011-11-23 11:43 ` Tomi Valkeinen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox