Skip to content

Commit c9261bc

Browse files
committed
drm/msm/dp: stop passing panel to msm_dp_audio_get()
The dp_audio module doesn't make any use of the passed DP panel instance. Drop the argument. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Tested-by: Stephen Boyd <swboyd@chromium.org> # sc7180-trogdor Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Patchwork: https://patchwork.freedesktop.org/patch/629056/ Link: https://lore.kernel.org/r/20241216-fd-dp-audio-fixup-v4-5-f8d1961cf22f@linaro.org
1 parent 429783c commit c9261bc

3 files changed

Lines changed: 2 additions & 6 deletions

File tree

drivers/gpu/drm/msm/dp/dp_audio.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,14 +351,13 @@ int msm_dp_register_audio_driver(struct device *dev,
351351
}
352352

353353
struct msm_dp_audio *msm_dp_audio_get(struct platform_device *pdev,
354-
struct msm_dp_panel *panel,
355354
struct msm_dp_catalog *catalog)
356355
{
357356
int rc = 0;
358357
struct msm_dp_audio_private *audio;
359358
struct msm_dp_audio *msm_dp_audio;
360359

361-
if (!pdev || !panel || !catalog) {
360+
if (!pdev || !catalog) {
362361
DRM_ERROR("invalid input\n");
363362
rc = -EINVAL;
364363
goto error;

drivers/gpu/drm/msm/dp/dp_audio.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include <linux/platform_device.h>
1010

11-
#include "dp_panel.h"
1211
#include "dp_catalog.h"
1312
#include <sound/hdmi-codec.h>
1413

@@ -28,14 +27,12 @@ struct msm_dp_audio {
2827
* Creates and instance of dp audio.
2928
*
3029
* @pdev: caller's platform device instance.
31-
* @panel: an instance of msm_dp_panel module.
3230
* @catalog: an instance of msm_dp_catalog module.
3331
*
3432
* Returns the error code in case of failure, otherwize
3533
* an instance of newly created msm_dp_module.
3634
*/
3735
struct msm_dp_audio *msm_dp_audio_get(struct platform_device *pdev,
38-
struct msm_dp_panel *panel,
3936
struct msm_dp_catalog *catalog);
4037

4138
/**

drivers/gpu/drm/msm/dp/dp_display.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ static int msm_dp_init_sub_modules(struct msm_dp_display_private *dp)
780780
goto error_ctrl;
781781
}
782782

783-
dp->audio = msm_dp_audio_get(dp->msm_dp_display.pdev, dp->panel, dp->catalog);
783+
dp->audio = msm_dp_audio_get(dp->msm_dp_display.pdev, dp->catalog);
784784
if (IS_ERR(dp->audio)) {
785785
rc = PTR_ERR(dp->audio);
786786
pr_err("failed to initialize audio, rc = %d\n", rc);

0 commit comments

Comments
 (0)