Re: [PATCH] drm: mediatek: fix prototypes after API change

From: Stephen Rothwell
Date: Wed Jun 29 2016 - 17:36:51 EST


Hi Arnd,

On Wed, 29 Jun 2016 16:51:29 +0200 Arnd Bergmann <arnd@xxxxxxxx> wrote:
>
> The newly added mediatek HDMI driver clashes with an API change
> for struct hdmi_codec_ops, causing an 'allmodconfig' build to fail:
>
> drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>
> This changes the API accordingly for the mediatek driver.
>
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> Fixes: 8f83f26891e1 ("drm/mediatek: Add HDMI support")
> Fixes: efc9194bcff8 ("ASoC: hdmi-codec: callback function will be called with private data")
> ---
> The new driver is currently part of Dave Airlie's drm-next tree,
> while the API change is in Mark Brown's asoc-next tree, so my
> fix has to be done on top of both.

Thanks for sorting this out.

> I can see two ways out of this:
>
> a) Stephen Rothwell could add my fixup on top of linux-next
> as a merge fix, and the fix gets sent to Linus Torvalds along
> with the second of the two branches

I'll do this today, unless someone does the other.

--
Cheers,
Stephen Rothwell