aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/mediatek/mtk_hdmi.c10
-rw-r--r--drivers/gpu/drm/sti/sti_hdmi.c7
2 files changed, 9 insertions, 8 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index ba812ef2c9d1..334562d06731 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1535,7 +1535,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
1535 * HDMI audio codec callbacks 1535 * HDMI audio codec callbacks
1536 */ 1536 */
1537 1537
1538static int mtk_hdmi_audio_hw_params(struct device *dev, 1538static int mtk_hdmi_audio_hw_params(struct device *dev, void *data,
1539 struct hdmi_codec_daifmt *daifmt, 1539 struct hdmi_codec_daifmt *daifmt,
1540 struct hdmi_codec_params *params) 1540 struct hdmi_codec_params *params)
1541{ 1541{
@@ -1604,7 +1604,7 @@ static int mtk_hdmi_audio_hw_params(struct device *dev,
1604 return 0; 1604 return 0;
1605} 1605}
1606 1606
1607static int mtk_hdmi_audio_startup(struct device *dev) 1607static int mtk_hdmi_audio_startup(struct device *dev, void *data)
1608{ 1608{
1609 struct mtk_hdmi *hdmi = dev_get_drvdata(dev); 1609 struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
1610 1610
@@ -1615,7 +1615,7 @@ static int mtk_hdmi_audio_startup(struct device *dev)
1615 return 0; 1615 return 0;
1616} 1616}
1617 1617
1618static void mtk_hdmi_audio_shutdown(struct device *dev) 1618static void mtk_hdmi_audio_shutdown(struct device *dev, void *data)
1619{ 1619{
1620 struct mtk_hdmi *hdmi = dev_get_drvdata(dev); 1620 struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
1621 1621
@@ -1624,7 +1624,7 @@ static void mtk_hdmi_audio_shutdown(struct device *dev)
1624 mtk_hdmi_audio_disable(hdmi); 1624 mtk_hdmi_audio_disable(hdmi);
1625} 1625}
1626 1626
1627int mtk_hdmi_audio_digital_mute(struct device *dev, bool enable) 1627int mtk_hdmi_audio_digital_mute(struct device *dev, void *data, bool enable)
1628{ 1628{
1629 struct mtk_hdmi *hdmi = dev_get_drvdata(dev); 1629 struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
1630 1630
@@ -1638,7 +1638,7 @@ int mtk_hdmi_audio_digital_mute(struct device *dev, bool enable)
1638 return 0; 1638 return 0;
1639} 1639}
1640 1640
1641static int mtk_hdmi_audio_get_eld(struct device *dev, uint8_t *buf, size_t len) 1641static int mtk_hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf, size_t len)
1642{ 1642{
1643 struct mtk_hdmi *hdmi = dev_get_drvdata(dev); 1643 struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
1644 1644
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 927e2b2e5af2..fedc17f98d9b 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -1169,7 +1169,7 @@ static int hdmi_audio_configure(struct sti_hdmi *hdmi,
1169 return hdmi_audio_infoframe_config(hdmi); 1169 return hdmi_audio_infoframe_config(hdmi);
1170} 1170}
1171 1171
1172static void hdmi_audio_shutdown(struct device *dev) 1172static void hdmi_audio_shutdown(struct device *dev, void *data)
1173{ 1173{
1174 struct sti_hdmi *hdmi = dev_get_drvdata(dev); 1174 struct sti_hdmi *hdmi = dev_get_drvdata(dev);
1175 int audio_cfg; 1175 int audio_cfg;
@@ -1186,6 +1186,7 @@ static void hdmi_audio_shutdown(struct device *dev)
1186} 1186}
1187 1187
1188static int hdmi_audio_hw_params(struct device *dev, 1188static int hdmi_audio_hw_params(struct device *dev,
1189 void *data,
1189 struct hdmi_codec_daifmt *daifmt, 1190 struct hdmi_codec_daifmt *daifmt,
1190 struct hdmi_codec_params *params) 1191 struct hdmi_codec_params *params)
1191{ 1192{
@@ -1221,7 +1222,7 @@ static int hdmi_audio_hw_params(struct device *dev,
1221 return 0; 1222 return 0;
1222} 1223}
1223 1224
1224static int hdmi_audio_digital_mute(struct device *dev, bool enable) 1225static int hdmi_audio_digital_mute(struct device *dev, void *data, bool enable)
1225{ 1226{
1226 struct sti_hdmi *hdmi = dev_get_drvdata(dev); 1227 struct sti_hdmi *hdmi = dev_get_drvdata(dev);
1227 1228
@@ -1235,7 +1236,7 @@ static int hdmi_audio_digital_mute(struct device *dev, bool enable)
1235 return 0; 1236 return 0;
1236} 1237}
1237 1238
1238static int hdmi_audio_get_eld(struct device *dev, uint8_t *buf, size_t len) 1239static int hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf, size_t len)
1239{ 1240{
1240 struct sti_hdmi *hdmi = dev_get_drvdata(dev); 1241 struct sti_hdmi *hdmi = dev_get_drvdata(dev);
1241 struct drm_connector *connector = hdmi->drm_connector; 1242 struct drm_connector *connector = hdmi->drm_connector;