Commit e68d490d authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Bartlomiej Zolnierkiewicz

fbdev: omapfb: delete check_required_callbacks()

Commit 561eb9d0 ("fbdev: omap/lcd: Make callbacks optional") made
panel callbacks optional but forgot to update check_required_callbacks().
As a result many (all?) OMAP systems using omapfb will crash at boot.
Fix by deleting the whole function.

Fixes: 561eb9d0 ("fbdev: omap/lcd: Make callbacks optional")
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 9121b15b
...@@ -1608,19 +1608,6 @@ static int omapfb_find_ctrl(struct omapfb_device *fbdev) ...@@ -1608,19 +1608,6 @@ static int omapfb_find_ctrl(struct omapfb_device *fbdev)
return 0; return 0;
} }
static void check_required_callbacks(struct omapfb_device *fbdev)
{
#define _C(x) (fbdev->ctrl->x != NULL)
#define _P(x) (fbdev->panel->x != NULL)
BUG_ON(fbdev->ctrl == NULL || fbdev->panel == NULL);
BUG_ON(!(_C(init) && _C(cleanup) && _C(get_caps) &&
_C(set_update_mode) && _C(setup_plane) && _C(enable_plane) &&
_P(init) && _P(cleanup) && _P(enable) && _P(disable) &&
_P(get_caps)));
#undef _P
#undef _C
}
/* /*
* Called by LDM binding to probe and attach a new device. * Called by LDM binding to probe and attach a new device.
* Initialization sequence: * Initialization sequence:
...@@ -1705,8 +1692,6 @@ static int omapfb_do_probe(struct platform_device *pdev, ...@@ -1705,8 +1692,6 @@ static int omapfb_do_probe(struct platform_device *pdev,
omapfb_ops.fb_mmap = omapfb_mmap; omapfb_ops.fb_mmap = omapfb_mmap;
init_state++; init_state++;
check_required_callbacks(fbdev);
r = planes_init(fbdev); r = planes_init(fbdev);
if (r) if (r)
goto cleanup; goto cleanup;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment