Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c22ad98 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

fbdev/sh_mob: Remove fb notifier callback 



This seems to be entirely defunct:

- The FB_EVEN_SUSPEND/RESUME events are only sent out by
  fb_set_suspend. Which is supposed to be called by drivers in their
  suspend/resume hooks, and not itself call into drivers. Luckily
  sh_mob doesn't call fb_set_suspend, so this seems to do nothing
  useful.

- The notify hook calls sh_mobile_fb_reconfig() which in turn can
  call into the fb notifier. Or attempt too, since that would
  deadlock.

So looks like leftover hacks from when this was originally introduced
in

commit 6011bdea
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date:   Wed Jul 21 10:13:21 2010 +0000

    fbdev: sh-mobile: HDMI support for SH-Mobile SoCs

So let's just remove it.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Markus Elfring <elfring@users.sourceforge.net>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-21-daniel.vetter@ffwll.ch
parent 927ab1ae

drivers/video/fbdev/sh_mobile_lcdcfb.c

+0 −38
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ struct sh_mobile_lcdc_priv { 
	struct sh_mobile_lcdc_chan ch[2];

	struct sh_mobile_lcdc_overlay overlays[4];



	struct notifier_block notifier;

	int started;

	int forced_fourcc; /* 2 channel LCDC must share fourcc setting */

};
@@ -2239,37 +2238,6 @@ static const struct dev_pm_ops sh_mobile_lcdc_dev_pm_ops = { 
 * Framebuffer notifier

 */



/* locking: called with info->lock held */

static int sh_mobile_lcdc_notify(struct notifier_block *nb,

				 unsigned long action, void *data)

{

	struct fb_event *event = data;

	struct fb_info *info = event->info;

	struct sh_mobile_lcdc_chan *ch = info->par;



	if (&ch->lcdc->notifier != nb)

		return NOTIFY_DONE;



	dev_dbg(info->dev, "%s(): action = %lu, data = %p\n",

		__func__, action, event->data);



	switch(action) {

	case FB_EVENT_SUSPEND:

		sh_mobile_lcdc_display_off(ch);

		sh_mobile_lcdc_stop(ch->lcdc);

		break;

	case FB_EVENT_RESUME:

		mutex_lock(&ch->open_lock);

		sh_mobile_fb_reconfig(info);

		mutex_unlock(&ch->open_lock);



		sh_mobile_lcdc_display_on(ch);

		sh_mobile_lcdc_start(ch->lcdc);

	}



	return NOTIFY_OK;

}



/* -----------------------------------------------------------------------------

 * Probe/remove and driver init/exit

 */
@@ -2297,8 +2265,6 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev) 
	struct sh_mobile_lcdc_priv *priv = platform_get_drvdata(pdev);

	unsigned int i;



	fb_unregister_client(&priv->notifier);



	for (i = 0; i < ARRAY_SIZE(priv->overlays); i++)

		sh_mobile_lcdc_overlay_fb_unregister(&priv->overlays[i]);

	for (i = 0; i < ARRAY_SIZE(priv->ch); i++)
@@ -2688,10 +2654,6 @@ static int sh_mobile_lcdc_probe(struct platform_device *pdev) 
			goto err1;

	}



	/* Failure ignored */

	priv->notifier.notifier_call = sh_mobile_lcdc_notify;

	fb_register_client(&priv->notifier);



	return 0;

err1:

	sh_mobile_lcdc_remove(pdev);