- rockchip: Revert change causing WARN on shutdown (Brian)

Cc: Brian Norris <briannorris@chromium.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEfxcpfMSgdnQMs+QqlvcN/ahKBwoFAlwRcrAACgkQlvcN/ahK
 BwpOLgf+IdngicDSObG8qga3Tr9sQIgxFZO868iUUW+3Nf0uCpRnAb/+e0Vou8Hy
 MzORi6jz9YpZIHT9ilp6f/iKXCcbWr3GRBRMJhNxDiLanxAvVv9k/ohMqU1Ow03q
 okpgWdGHB++XuUV/bkSYP97Vq6uHWM/oVx48YTe/IKPGoHeQ+cNPg7hkixOZW9Az
 ihTRttUiSEEf17xBWUNXySaAnWVsgmAh9ZFR/oV8fKdhqogAwScvnHSiJZQLOBTP
 x6HKjqV5Gz/OdCox3mzPZTZhNrcjzizfw3JbYJ6tDryA5YWbuZh2fG35XPMiGt45
 n6myxDFUnhwfINHgf9PCkTmG3WMHLA==
 =cz8I
 -----END PGP SIGNATURE-----

Merge tag 'drm-misc-fixes-2018-12-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

- rockchip: Revert change causing WARN on shutdown (Brian)

Cc: Brian Norris <briannorris@chromium.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212204309.GA150523@art_vandelay
This commit is contained in:
Dave Airlie 2018-12-13 07:25:00 +10:00
commit e59166b59a
1 changed files with 0 additions and 6 deletions

View File

@ -448,11 +448,6 @@ static int rockchip_drm_platform_remove(struct platform_device *pdev)
return 0;
}
static void rockchip_drm_platform_shutdown(struct platform_device *pdev)
{
rockchip_drm_platform_remove(pdev);
}
static const struct of_device_id rockchip_drm_dt_ids[] = {
{ .compatible = "rockchip,display-subsystem", },
{ /* sentinel */ },
@ -462,7 +457,6 @@ MODULE_DEVICE_TABLE(of, rockchip_drm_dt_ids);
static struct platform_driver rockchip_drm_platform_driver = {
.probe = rockchip_drm_platform_probe,
.remove = rockchip_drm_platform_remove,
.shutdown = rockchip_drm_platform_shutdown,
.driver = {
.name = "rockchip-drm",
.of_match_table = rockchip_drm_dt_ids,