Merge tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / gpu / drm / tegra / dc.c

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 826b3f047c0cfacc38fd983b6a1b307b1944add9..cf25f183c4a71b25ac6e10dfff0a88f7e4fc7f07 100644 (file)
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -2372,10 +2372,10 @@ static int tegra_dc_parse_dt(struct tegra_dc *dc)
        return 0;
 }
 
-static int tegra_dc_match_by_pipe(struct device *dev, void *data)
+static int tegra_dc_match_by_pipe(struct device *dev, const void *data)
 {
        struct tegra_dc *dc = dev_get_drvdata(dev);
-       unsigned int pipe = (unsigned long)data;
+       unsigned int pipe = (unsigned long)(void *)data;
 
        return dc->pipe == pipe;
 }