On Thu, Mar 05, 2020 at 04:59:30PM +0100, Thomas Zimmermann wrote:
> The atmel-hlcdc driver uses an empty implementation for its encoder.
> Replace the code with the generic simple encoder.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
Reviewed-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
> ---
> drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
> index e2019fe97fff..43bc709e3523 100644
> --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
> +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
> @@ -11,9 +11,10 @@
> #include <linux/media-bus-format.h>
> #include <linux/of_graph.h>
>
> +#include <drm/drm_bridge.h>
> #include <drm/drm_encoder.h>
> #include <drm/drm_of.h>
> -#include <drm/drm_bridge.h>
> +#include <drm/drm_simple_kms_helper.h>
>
> #include "atmel_hlcdc_dc.h"
>
> @@ -22,10 +23,6 @@ struct atmel_hlcdc_rgb_output {
> int bus_fmt;
> };
>
> -static const struct drm_encoder_funcs atmel_hlcdc_panel_encoder_funcs = {
> - .destroy = drm_encoder_cleanup,
> -};
> -
> static struct atmel_hlcdc_rgb_output *
> atmel_hlcdc_encoder_to_rgb_output(struct drm_encoder *encoder)
> {
> @@ -98,9 +95,8 @@ static int atmel_hlcdc_attach_endpoint(struct drm_device *dev, int endpoint)
> return -EINVAL;
> }
>
> - ret = drm_encoder_init(dev, &output->encoder,
> - &atmel_hlcdc_panel_encoder_funcs,
> - DRM_MODE_ENCODER_NONE, NULL);
> + ret = drm_simple_encoder_init(dev, &output->encoder,
> + DRM_MODE_ENCODER_NONE);
> if (ret)
> return ret;
>
> --
> 2.25.1
