drm/panel: remove return value of function drm_panel_add
Subsystems (31)
PATCH 1/1 drm/panel: remove return value of function drm_panel_add
The function "int drm_panel_add(struct drm_panel *panel)" always returns 0, this return value is meaningless. Also, there is no need to check return value which calls "drm_panel_add and", error branch code will never run.
--- drivers/gpu/drm/drm_panel.c | 4 +--- drivers/gpu/drm/panel/panel-arm-versatile.c | 4 +++- drivers/gpu/drm/panel/panel-boe-himax8279d.c | 4 +++- drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 4 +++- drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 4 +--- drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 4 +--- drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 4 +++- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 4 +--- drivers/gpu/drm/panel/panel-innolux-p079zca.c | 4 +--- drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 4 ++-- drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 4 +++- drivers/gpu/drm/panel/panel-lg-lb035q02.c | 4 +++- drivers/gpu/drm/panel/panel-lg-lg4573.c | 4 +++- drivers/gpu/drm/panel/panel-lvds.c | 4 +--- drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 4 +++- drivers/gpu/drm/panel/panel-novatek-nt35510.c | 4 +--- drivers/gpu/drm/panel/panel-novatek-nt39016.c | 6 +----- drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 4 +++- drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 4 +++- drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 4 +++- drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 4 +--- drivers/gpu/drm/panel/panel-raydium-rm67191.c | 4 +--- drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 4 +--- drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +++- drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 4 +--- drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 4 +--- drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 4 +--- drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 4 +++- drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 6 +----- drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 4 +--- drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 4 +--- drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 4 +++- drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 4 +++- drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 4 +++- drivers/gpu/drm/panel/panel-simple.c | 4 +--- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 4 +--- drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +--- drivers/gpu/drm/panel/panel-sony-acx424akp.c | 4 +--- drivers/gpu/drm/panel/panel-sony-acx565akm.c | 7 +------ drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 4 +++- drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 6 +----- drivers/gpu/drm/panel/panel-tpo-tpg110.c | 4 +++- include/drm/drm_panel.h | 2 +- 43 files changed, 80 insertions(+), 99 deletions(-)
drivers/gpu/drm/drm_panel.c +1 -3
@@ -73,13 +73,11 @@ EXPORT_SYMBOL(drm_panel_init);* * Return: 0 on success or a negative error code on failure. */ -int drm_panel_add (struct drm_panel *panel) +void drm_panel_add (struct drm_panel *panel) {mutex_lock (&panel_lock);list_add_tail (&panel->list, &panel_list);mutex_unlock (&panel_lock); - -return 0 ; }EXPORT_SYMBOL (drm_panel_add);
drivers/gpu/drm/panel/panel-arm-versatile.c +3 -1
@@ -353,7 +353,9 @@ static int versatile_panel_probe(struct platform_device *pdev)drm_panel_init (&vpanel->panel, dev, &versatile_panel_drm_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&vpanel->panel); +drm_panel_add (&vpanel->panel); + +return 0 ; }static const struct of_device_id versatile_panel_match[] = {
drivers/gpu/drm/panel/panel-boe-himax8279d.c +3 -1
@@ -896,7 +896,9 @@ static int panel_add(struct panel_info *pinfo)if (ret)return ret; -return drm_panel_add (&pinfo->base); +drm_panel_add (&pinfo->base); + +return 0 ; }static int panel_probe (struct mipi_dsi_device *dsi)
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c +3 -1
@@ -792,7 +792,9 @@ static int boe_panel_add(struct boe_panel *boe) boe->base.funcs = &boe_panel_funcs; boe->base.dev = &boe->dsi->dev; -return drm_panel_add (&boe->base); +drm_panel_add (&boe->base); + +return 0 ; }static int boe_panel_probe (struct mipi_dsi_device *dsi)
drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c +1 -3
@@ -478,9 +478,7 @@ static int k101_im2ba02_dsi_probe(struct mipi_dsi_device *dsi)if (ret)return ret; - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&ctx->panel); dsi->mode_flags =MIPI_DSI_MODE_VIDEO ; dsi->format =MIPI_DSI_FMT_RGB888 ;
drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c +1 -3
@@ -225,9 +225,7 @@ static int feiyang_dsi_probe(struct mipi_dsi_device *dsi)if (ret)return ret; - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&ctx->panel); dsi->mode_flags =MIPI_DSI_MODE_VIDEO_BURST ; dsi->format =MIPI_DSI_FMT_RGB888 ;
drivers/gpu/drm/panel/panel-ilitek-ili9322.c +3 -1
@@ -899,7 +899,9 @@ static int ili9322_probe(struct spi_device *spi)drm_panel_init (&ili->panel, dev, &ili9322_drm_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&ili->panel); +drm_panel_add (&ili->panel); + +return 0 ; }static int ili9322_remove (struct spi_device *spi)
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +1 -3
@@ -447,9 +447,7 @@ static int ili9881c_dsi_probe(struct mipi_dsi_device *dsi)if (ret)return ret; - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&ctx->panel); dsi->mode_flags =MIPI_DSI_MODE_VIDEO_SYNC_PULSE ; dsi->format =MIPI_DSI_FMT_RGB888 ;
drivers/gpu/drm/panel/panel-innolux-p079zca.c +1 -3
@@ -477,9 +477,7 @@ static int innolux_panel_add(struct mipi_dsi_device *dsi,if (err)return err; - err =drm_panel_add (&innolux->base); -if (err <0 ) -return err; +drm_panel_add (&innolux->base);mipi_dsi_set_drvdata (dsi, innolux); innolux->link = dsi;
drivers/gpu/drm/panel/panel-jdi-lt070me05000.c +2 -2
@@ -441,9 +441,9 @@ static int jdi_panel_add(struct jdi_panel *jdi)drm_panel_init (&jdi->base, &jdi->dsi->dev, &jdi_panel_funcs,DRM_MODE_CONNECTOR_DSI ); - ret =drm_panel_add (&jdi->base); +drm_panel_add (&jdi->base); -return ret; +return 0 ; }static void jdi_panel_del (struct jdi_panel *jdi)
drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c +3 -1
@@ -383,7 +383,9 @@ static int kingdisplay_panel_add(struct kingdisplay_panel *kingdisplay)if (err)return err; -return drm_panel_add (&kingdisplay->base); +drm_panel_add (&kingdisplay->base); + +return 0 ; }static void kingdisplay_panel_del (struct kingdisplay_panel *kingdisplay)
drivers/gpu/drm/panel/panel-lg-lb035q02.c +3 -1
@@ -199,7 +199,9 @@ static int lb035q02_probe(struct spi_device *spi)drm_panel_init (&lcd->panel, &lcd->spi->dev, &lb035q02_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&lcd->panel); +drm_panel_add (&lcd->panel); + +return 0 ; }static int lb035q02_remove (struct spi_device *spi)
drivers/gpu/drm/panel/panel-lg-lg4573.c +3 -1
@@ -262,7 +262,9 @@ static int lg4573_probe(struct spi_device *spi)drm_panel_init (&ctx->panel, &spi->dev, &lg4573_drm_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&ctx->panel); +drm_panel_add (&ctx->panel); + +return 0 ; }static int lg4573_remove (struct spi_device *spi)
drivers/gpu/drm/panel/panel-lvds.c +1 -3
@@ -227,9 +227,7 @@ static int panel_lvds_probe(struct platform_device *pdev)if (ret)return ret; - ret =drm_panel_add (&lvds->panel); -if (ret <0 ) -return ret; +drm_panel_add (&lvds->panel);dev_set_drvdata (lvds->dev, lvds);return 0 ;
drivers/gpu/drm/panel/panel-nec-nl8048hl11.c +3 -1
@@ -208,7 +208,9 @@ static int nl8048_probe(struct spi_device *spi)drm_panel_init (&lcd->panel, &lcd->spi->dev, &nl8048_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&lcd->panel); +drm_panel_add (&lcd->panel); + +return 0 ; }static int nl8048_remove (struct spi_device *spi)
drivers/gpu/drm/panel/panel-novatek-nt35510.c +1 -3
@@ -956,9 +956,7 @@ static int nt35510_probe(struct mipi_dsi_device *dsi) nt->panel.backlight = bl; } - ret =drm_panel_add (&nt->panel); -if (ret <0 ) -return ret; +drm_panel_add (&nt->panel); ret =mipi_dsi_attach (dsi);if (ret <0 )
drivers/gpu/drm/panel/panel-novatek-nt39016.c +1 -5
@@ -303,11 +303,7 @@ static int nt39016_probe(struct spi_device *spi)drm_panel_init (&panel->drm_panel, dev, &nt39016_funcs,DRM_MODE_CONNECTOR_DPI ); - err =drm_panel_add (&panel->drm_panel); -if (err <0 ) { -dev_err (dev,"Failed to register panel" ); -return err; - } +drm_panel_add (&panel->drm_panel);return 0 ; }
drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c +3 -1
@@ -284,7 +284,9 @@ static int lcd_olinuxino_probe(struct i2c_client *client,if (ret)return ret; -return drm_panel_add (&lcd->panel); +drm_panel_add (&lcd->panel); + +return 0 ; }static int lcd_olinuxino_remove (struct i2c_client *client)
drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c +3 -1
@@ -165,7 +165,9 @@ static int osd101t2587_panel_add(struct osd101t2587_panel *osd101t2587)if (ret)return ret; -return drm_panel_add (&osd101t2587->base); +drm_panel_add (&osd101t2587->base); + +return 0 ; }static int osd101t2587_panel_probe (struct mipi_dsi_device *dsi)
drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c +3 -1
@@ -207,7 +207,9 @@ static int wuxga_nt_panel_add(struct wuxga_nt_panel *wuxga_nt)if (ret)return ret; -return drm_panel_add (&wuxga_nt->base); +drm_panel_add (&wuxga_nt->base); + +return 0 ; }static void wuxga_nt_panel_del (struct wuxga_nt_panel *wuxga_nt)
drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +1 -3
@@ -429,9 +429,7 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c,/* This appears last, as it's what will unblock the DSI host * driver's component bind function. */ - ret =drm_panel_add (&ts->base); -if (ret) -return ret; +drm_panel_add (&ts->base);return 0 ;
drivers/gpu/drm/panel/panel-raydium-rm67191.c +1 -3
@@ -610,9 +610,7 @@ static int rad_panel_probe(struct mipi_dsi_device *dsi) DRM_MODE_CONNECTOR_DSI);dev_set_drvdata (dev, panel); - ret =drm_panel_add (&panel->panel); -if (ret) -return ret; +drm_panel_add (&panel->panel); ret =mipi_dsi_attach (dsi);if (ret)
drivers/gpu/drm/panel/panel-ronbo-rb070d30.c +1 -3
@@ -201,9 +201,7 @@ static int rb070d30_panel_dsi_probe(struct mipi_dsi_device *dsi)if (ret)return ret; - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&ctx->panel); dsi->mode_flags =MIPI_DSI_MODE_VIDEO |MIPI_DSI_MODE_VIDEO_BURST |MIPI_DSI_MODE_LPM ; dsi->format =MIPI_DSI_FMT_RGB888 ;
drivers/gpu/drm/panel/panel-samsung-ld9040.c +3 -1
@@ -354,7 +354,9 @@ static int ld9040_probe(struct spi_device *spi)drm_panel_init (&ctx->panel, dev, &ld9040_drm_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&ctx->panel); +drm_panel_add (&ctx->panel); + +return 0 ; }static int ld9040_remove (struct spi_device *spi)
drivers/gpu/drm/panel/panel-samsung-s6d16d0.c +1 -3
@@ -218,9 +218,7 @@ static int s6d16d0_probe(struct mipi_dsi_device *dsi)drm_panel_init (&s6->panel, dev, &s6d16d0_drm_funcs,DRM_MODE_CONNECTOR_DSI ); - ret =drm_panel_add (&s6->panel); -if (ret <0 ) -return ret; +drm_panel_add (&s6->panel); ret =mipi_dsi_attach (dsi);if (ret <0 )
drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c +1 -3
@@ -735,9 +735,7 @@ static int s6e3ha2_probe(struct mipi_dsi_device *dsi)drm_panel_init (&ctx->panel, dev, &s6e3ha2_drm_funcs,DRM_MODE_CONNECTOR_DSI ); - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) - goto unregister_backlight; +drm_panel_add (&ctx->panel); ret =mipi_dsi_attach (dsi);if (ret <0 )
drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c +1 -3
@@ -480,9 +480,7 @@ static int s6e63j0x03_probe(struct mipi_dsi_device *dsi) ctx->bl_dev->props.brightness =DEFAULT_BRIGHTNESS ; ctx->bl_dev->props.power =FB_BLANK_POWERDOWN ; - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) - goto unregister_backlight; +drm_panel_add (&ctx->panel); ret =mipi_dsi_attach (dsi);if (ret <0 )
drivers/gpu/drm/panel/panel-samsung-s6e63m0.c +3 -1
@@ -480,7 +480,9 @@ static int s6e63m0_probe(struct spi_device *spi)if (ret <0 )return ret; -return drm_panel_add (&ctx->panel); +drm_panel_add (&ctx->panel); + +return 0 ; }static int s6e63m0_remove (struct spi_device *spi)
drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams452ef01.c +1 -5
@@ -243,11 +243,7 @@ static int s6e88a0_ams452ef01_probe(struct mipi_dsi_device *dsi)drm_panel_init (&ctx->panel, dev, &s6e88a0_ams452ef01_panel_funcs,DRM_MODE_CONNECTOR_DSI ); - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) { -dev_err (dev,"Failed to add panel: %d\n" , ret); -return ret; - } +drm_panel_add (&ctx->panel); ret =mipi_dsi_attach (dsi);if (ret <0 ) {
drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c +1 -3
@@ -1020,9 +1020,7 @@ static int s6e8aa0_probe(struct mipi_dsi_device *dsi)drm_panel_init (&ctx->panel, dev, &s6e8aa0_drm_funcs,DRM_MODE_CONNECTOR_DSI ); - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&ctx->panel); ret =mipi_dsi_attach (dsi);if (ret <0 )
drivers/gpu/drm/panel/panel-seiko-43wvf1g.c +1 -3
@@ -257,9 +257,7 @@ static int seiko_panel_probe(struct device *dev,if (err)return err; - err =drm_panel_add (&panel->base); -if (err <0 ) -return err; +drm_panel_add (&panel->base);dev_set_drvdata (dev, panel);
drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c +3 -1
@@ -326,7 +326,9 @@ static int sharp_panel_add(struct sharp_panel *sharp)if (ret)return ret; -return drm_panel_add (&sharp->base); +drm_panel_add (&sharp->base); + +return 0 ; }static void sharp_panel_del (struct sharp_panel *sharp)
drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c +3 -1
@@ -188,7 +188,9 @@ static int ls037v7dw01_probe(struct platform_device *pdev)drm_panel_init (&lcd->panel, &pdev->dev, &ls037v7dw01_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&lcd->panel); +drm_panel_add (&lcd->panel); + +return 0 ; }static int ls037v7dw01_remove (struct platform_device *pdev)
drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c +3 -1
@@ -262,7 +262,9 @@ static int sharp_nt_panel_add(struct sharp_nt_panel *sharp_nt)if (ret)return ret; -return drm_panel_add (&sharp_nt->base); +drm_panel_add (&sharp_nt->base); + +return 0 ; }static void sharp_nt_panel_del (struct sharp_nt_panel *sharp_nt)
drivers/gpu/drm/panel/panel-simple.c +1 -3
@@ -555,9 +555,7 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc)if (err) goto free_ddc; - err =drm_panel_add (&panel->base); -if (err <0 ) - goto free_ddc; +drm_panel_add (&panel->base);dev_set_drvdata (dev, panel);
drivers/gpu/drm/panel/panel-sitronix-st7701.c +1 -3
@@ -380,9 +380,7 @@ static int st7701_dsi_probe(struct mipi_dsi_device *dsi)if (ret)return ret; - ret =drm_panel_add (&st7701->panel); -if (ret <0 ) -return ret; +drm_panel_add (&st7701->panel);mipi_dsi_set_drvdata (dsi, st7701); st7701->dsi = dsi;
drivers/gpu/drm/panel/panel-sitronix-st7789v.c +1 -3
@@ -383,9 +383,7 @@ static int st7789v_probe(struct spi_device *spi)if (ret)return ret; - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&ctx->panel);return 0 ; }
drivers/gpu/drm/panel/panel-sony-acx424akp.c +1 -3
@@ -506,9 +506,7 @@ static int acx424akp_probe(struct mipi_dsi_device *dsi) acx->bl->props.brightness =512 ; acx->bl->props.power =FB_BLANK_POWERDOWN ; - ret =drm_panel_add (&acx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&acx->panel); ret =mipi_dsi_attach (dsi);if (ret <0 ) {
drivers/gpu/drm/panel/panel-sony-acx565akm.c +1 -6
@@ -651,12 +651,7 @@ static int acx565akm_probe(struct spi_device *spi)drm_panel_init (&lcd->panel, &lcd->spi->dev, &acx565akm_funcs,DRM_MODE_CONNECTOR_DPI ); - ret =drm_panel_add (&lcd->panel); -if (ret <0 ) { -if (lcd->has_bc) -acx565akm_backlight_cleanup (lcd); -return ret; - } +drm_panel_add (&lcd->panel);return 0 ; }
drivers/gpu/drm/panel/panel-tpo-td028ttec1.c +3 -1
@@ -351,7 +351,9 @@ static int td028ttec1_probe(struct spi_device *spi)if (ret)return ret; -return drm_panel_add (&lcd->panel); +drm_panel_add (&lcd->panel); + +return 0 ; }static int td028ttec1_remove (struct spi_device *spi)
drivers/gpu/drm/panel/panel-tpo-td043mtea1.c +1 -5
@@ -461,11 +461,7 @@ static int td043mtea1_probe(struct spi_device *spi)drm_panel_init (&lcd->panel, &lcd->spi->dev, &td043mtea1_funcs,DRM_MODE_CONNECTOR_DPI ); - ret =drm_panel_add (&lcd->panel); -if (ret <0 ) { -sysfs_remove_group (&spi->dev.kobj, &td043mtea1_attr_group); -return ret; - } +drm_panel_add (&lcd->panel);return 0 ; }
drivers/gpu/drm/panel/panel-tpo-tpg110.c +3 -1
@@ -453,7 +453,9 @@ static int tpg110_probe(struct spi_device *spi)spi_set_drvdata (spi, tpg); -return drm_panel_add (&tpg->panel); +drm_panel_add (&tpg->panel); + +return 0 ; }static int tpg110_remove (struct spi_device *spi)
include/drm/drm_panel.h +1 -1
@@ -175,7 +175,7 @@ void drm_panel_init(struct drm_panel *panel, struct device *dev,const struct drm_panel_funcs *funcs, int connector_type); -int drm_panel_add (struct drm_panel *panel); +void drm_panel_add (struct drm_panel *panel);void drm_panel_remove (struct drm_panel *panel);int drm_panel_attach (struct drm_panel *panel,struct drm_connector *connector);
Signature · 1 line
2.17.1
Quoted 6 lines · Bernard Zhao
The function "int
drm_panel_add(struct drm_panel *panel)" always returns 0, this return value is meaningless. Also, there is no need to check return value which calls "drm_panel_addand", error branch code will never run.Signed-off-by Bernard Zhao <[email protected]>
Makes sense.
Yours,
Linus Walleij
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Bernard,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v5.8-rc7 next-20200731]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Bernard-Zhao/drm-panel-remove-return-value-of-function-drm_panel_add/20200801-200252 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 7dc6fd0f3b8404542718039f5de19fe56e474578 config: x86_64-randconfig-a002-20200801 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 9f21947a331203ee2579db87f1d1ec22a949e20a)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All error/warnings (new ones prefixed by >>):
>> drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c:749:1: warning: unused label 'unregister_backlight' [-Wunused-label]
unregister_backlight:
^~~~~~~~~~~~~~~~~~~~~
1 warning generated.
--
>> drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c:494:1: warning: unused label 'unregister_backlight' [-Wunused-label]
unregister_backlight:
^~~~~~~~~~~~~~~~~~~~~
1 warning generated.
--
>> drivers/gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c:319:6: error: assigning to 'int' from incompatible type 'void'
ret = drm_panel_add(&ctx->panel);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~1 error generated.
vim +/unregister_backlight +749 drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 680
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 681 static int s6e3ha2_probe(struct mipi_dsi_device *dsi)
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 682 {
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 683 struct device *dev = &dsi->dev;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 684 struct s6e3ha2 *ctx;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 685 int ret;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 686
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 687 ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 688 if (!ctx)
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 689 return -ENOMEM;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 690
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 691 mipi_dsi_set_drvdata(dsi, ctx);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 692
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 693 ctx->dev = dev;
e2af12bfb0ba198 Hoegeun Kwon 2017-04-18 694 ctx->desc = of_device_get_match_data(dev);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 695
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 696 dsi->lanes = 4;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 697 dsi->format = MIPI_DSI_FMT_RGB888;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 698 dsi->mode_flags = MIPI_DSI_CLOCK_NON_CONTINUOUS;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 699
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 700 ctx->supplies[0].supply = "vdd3";
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 701 ctx->supplies[1].supply = "vci";
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 702
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 703 ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ctx->supplies),
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 704 ctx->supplies);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 705 if (ret < 0) {
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 706 dev_err(dev, "failed to get regulators: %d\n", ret);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 707 return ret;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 708 }
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 709
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 710 ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 711 if (IS_ERR(ctx->reset_gpio)) {
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 712 dev_err(dev, "cannot get reset-gpios %ld\n",
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 713 PTR_ERR(ctx->reset_gpio));
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 714 return PTR_ERR(ctx->reset_gpio);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 715 }
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 716
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 717 ctx->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_HIGH);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 718 if (IS_ERR(ctx->enable_gpio)) {
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 719 dev_err(dev, "cannot get enable-gpios %ld\n",
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 720 PTR_ERR(ctx->enable_gpio));
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 721 return PTR_ERR(ctx->enable_gpio);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 722 }
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 723
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 724 ctx->bl_dev = backlight_device_register("s6e3ha2", dev, ctx,
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 725 &s6e3ha2_bl_ops, NULL);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 726 if (IS_ERR(ctx->bl_dev)) {
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 727 dev_err(dev, "failed to register backlight device\n");
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 728 return PTR_ERR(ctx->bl_dev);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 729 }
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 730
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 731 ctx->bl_dev->props.max_brightness = S6E3HA2_MAX_BRIGHTNESS;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 732 ctx->bl_dev->props.brightness = S6E3HA2_DEFAULT_BRIGHTNESS;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 733 ctx->bl_dev->props.power = FB_BLANK_POWERDOWN;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 734
9a2654c0f62a170 Laurent Pinchart 2019-09-04 735 drm_panel_init(&ctx->panel, dev, &s6e3ha2_drm_funcs,
9a2654c0f62a170 Laurent Pinchart 2019-09-04 736 DRM_MODE_CONNECTOR_DSI);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 737
b5fd4505cdbf1b5 Bernard Zhao 2020-08-01 738 drm_panel_add(&ctx->panel);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 739
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 740 ret = mipi_dsi_attach(dsi);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 741 if (ret < 0)
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 742 goto remove_panel;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 743
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 744 return ret;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 745
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 746 remove_panel:
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 747 drm_panel_remove(&ctx->panel);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 748
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 @749 unregister_backlight:
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 750 backlight_device_unregister(ctx->bl_dev);
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 751
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 752 return ret;
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 753 }
ed29f9426d9bf1b Hoegeun Kwon 2017-03-08 754 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Hi Bernard.
Quoted 4 lines · Bernard Zhao
The function "int
drm_panel_add(struct drm_panel *panel)" always returns 0, this return value is meaningless. Also, there is no need to check return value which calls "drm_panel_addand", error branch code will never run.
Thanks for this nice cleanup.
Applied to drm-misc-next - so it will appear in -next after the upcoming merge window and will hit upstream in 5.10
While applying I did the following modifications:
- Fixed kernel-doc as the function returns a void
- Fixed one panel that was missing the conversion
- Fixed warnings due to unused labels
If you are up to another cleanup task there is drm_panel_attach() and drm_panel_detach() which are no longer needed and all users and the empty implementations can be dropped.
This will touch a lot of drivers so this change should be split in one patch/driver.
bridge/* can be handled as one patch I think.
imx/* is already done, awaiting to be applied.
Sam
Quoted 707 lines
Signed-off-by Bernard Zhao <[email protected]>--- drivers/gpu/drm/drm_panel.c | 4 +--- drivers/gpu/drm/panel/panel-arm-versatile.c | 4 +++- drivers/gpu/drm/panel/panel-boe-himax8279d.c | 4 +++- drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 4 +++- drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 4 +--- drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 4 +--- drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 4 +++- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 4 +--- drivers/gpu/drm/panel/panel-innolux-p079zca.c | 4 +--- drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 4 ++-- drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 4 +++- drivers/gpu/drm/panel/panel-lg-lb035q02.c | 4 +++- drivers/gpu/drm/panel/panel-lg-lg4573.c | 4 +++- drivers/gpu/drm/panel/panel-lvds.c | 4 +--- drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 4 +++- drivers/gpu/drm/panel/panel-novatek-nt35510.c | 4 +--- drivers/gpu/drm/panel/panel-novatek-nt39016.c | 6 +----- drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 4 +++- drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 4 +++- drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 4 +++- drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 4 +--- drivers/gpu/drm/panel/panel-raydium-rm67191.c | 4 +--- drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 4 +--- drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +++- drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 4 +--- drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 4 +--- drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 4 +--- drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 4 +++- drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 6 +----- drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 4 +--- drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 4 +--- drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 4 +++- drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 4 +++- drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 4 +++- drivers/gpu/drm/panel/panel-simple.c | 4 +--- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 4 +--- drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +--- drivers/gpu/drm/panel/panel-sony-acx424akp.c | 4 +--- drivers/gpu/drm/panel/panel-sony-acx565akm.c | 7 +------ drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 4 +++- drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 6 +----- drivers/gpu/drm/panel/panel-tpo-tpg110.c | 4 +++- include/drm/drm_panel.h | 2 +- 43 files changed, 80 insertions(+), 99 deletions(-)drivers/gpu/drm/drm_panel.c +1
-3@@ -73,13 +73,11 @@ EXPORT_SYMBOL(drm_panel_init);* * Return: 0 on success or a negative error code on failure. */ -int drm_panel_add (struct drm_panel *panel) +void drm_panel_add (struct drm_panel *panel) {mutex_lock (&panel_lock);list_add_tail (&panel->list, &panel_list);mutex_unlock (&panel_lock); - -return 0 ; }EXPORT_SYMBOL (drm_panel_add);drivers/gpu/drm/panel/panel-arm-versatile.c +3
-1@@ -353,7 +353,9 @@ static int versatile_panel_probe(struct platform_device *pdev)drm_panel_init (&vpanel->panel, dev, &versatile_panel_drm_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&vpanel->panel); +drm_panel_add (&vpanel->panel); + +return 0 ; }static const struct of_device_id versatile_panel_match[] = {drivers/gpu/drm/panel/panel-boe-himax8279d.c +3
-1@@ -896,7 +896,9 @@ static int panel_add(struct panel_info *pinfo)if (ret)return ret; -return drm_panel_add (&pinfo->base); +drm_panel_add (&pinfo->base); + +return 0 ; }static int panel_probe (struct mipi_dsi_device *dsi)drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c +3
-1@@ -792,7 +792,9 @@ static int boe_panel_add(struct boe_panel *boe) boe->base.funcs = &boe_panel_funcs; boe->base.dev = &boe->dsi->dev; -return drm_panel_add (&boe->base); +drm_panel_add (&boe->base); + +return 0 ; }static int boe_panel_probe (struct mipi_dsi_device *dsi)drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c +1
-3@@ -478,9 +478,7 @@ static int k101_im2ba02_dsi_probe(struct mipi_dsi_device *dsi)if (ret)return ret; - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&ctx->panel); dsi->mode_flags =MIPI_DSI_MODE_VIDEO ; dsi->format =MIPI_DSI_FMT_RGB888 ;drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c +1
-3@@ -225,9 +225,7 @@ static int feiyang_dsi_probe(struct mipi_dsi_device *dsi)if (ret)return ret; - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&ctx->panel); dsi->mode_flags =MIPI_DSI_MODE_VIDEO_BURST ; dsi->format =MIPI_DSI_FMT_RGB888 ;drivers/gpu/drm/panel/panel-ilitek-ili9322.c +3
-1@@ -899,7 +899,9 @@ static int ili9322_probe(struct spi_device *spi)drm_panel_init (&ili->panel, dev, &ili9322_drm_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&ili->panel); +drm_panel_add (&ili->panel); + +return 0 ; }static int ili9322_remove (struct spi_device *spi)drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +1
-3@@ -447,9 +447,7 @@ static int ili9881c_dsi_probe(struct mipi_dsi_device *dsi)if (ret)return ret; - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&ctx->panel); dsi->mode_flags =MIPI_DSI_MODE_VIDEO_SYNC_PULSE ; dsi->format =MIPI_DSI_FMT_RGB888 ;drivers/gpu/drm/panel/panel-innolux-p079zca.c +1
-3@@ -477,9 +477,7 @@ static int innolux_panel_add(struct mipi_dsi_device *dsi,if (err)return err; - err =drm_panel_add (&innolux->base); -if (err <0 ) -return err; +drm_panel_add (&innolux->base);mipi_dsi_set_drvdata (dsi, innolux); innolux->link = dsi;drivers/gpu/drm/panel/panel-jdi-lt070me05000.c +2
-2@@ -441,9 +441,9 @@ static int jdi_panel_add(struct jdi_panel *jdi)drm_panel_init (&jdi->base, &jdi->dsi->dev, &jdi_panel_funcs,DRM_MODE_CONNECTOR_DSI ); - ret =drm_panel_add (&jdi->base); +drm_panel_add (&jdi->base); -return ret; +return 0 ; }static void jdi_panel_del (struct jdi_panel *jdi)drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c +3
-1@@ -383,7 +383,9 @@ static int kingdisplay_panel_add(struct kingdisplay_panel *kingdisplay)if (err)return err; -return drm_panel_add (&kingdisplay->base); +drm_panel_add (&kingdisplay->base); + +return 0 ; }static void kingdisplay_panel_del (struct kingdisplay_panel *kingdisplay)drivers/gpu/drm/panel/panel-lg-lb035q02.c +3
-1@@ -199,7 +199,9 @@ static int lb035q02_probe(struct spi_device *spi)drm_panel_init (&lcd->panel, &lcd->spi->dev, &lb035q02_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&lcd->panel); +drm_panel_add (&lcd->panel); + +return 0 ; }static int lb035q02_remove (struct spi_device *spi)drivers/gpu/drm/panel/panel-lg-lg4573.c +3
-1@@ -262,7 +262,9 @@ static int lg4573_probe(struct spi_device *spi)drm_panel_init (&ctx->panel, &spi->dev, &lg4573_drm_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&ctx->panel); +drm_panel_add (&ctx->panel); + +return 0 ; }static int lg4573_remove (struct spi_device *spi)drivers/gpu/drm/panel/panel-lvds.c +1
-3@@ -227,9 +227,7 @@ static int panel_lvds_probe(struct platform_device *pdev)if (ret)return ret; - ret =drm_panel_add (&lvds->panel); -if (ret <0 ) -return ret; +drm_panel_add (&lvds->panel);dev_set_drvdata (lvds->dev, lvds);return 0 ;drivers/gpu/drm/panel/panel-nec-nl8048hl11.c +3
-1@@ -208,7 +208,9 @@ static int nl8048_probe(struct spi_device *spi)drm_panel_init (&lcd->panel, &lcd->spi->dev, &nl8048_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&lcd->panel); +drm_panel_add (&lcd->panel); + +return 0 ; }static int nl8048_remove (struct spi_device *spi)drivers/gpu/drm/panel/panel-novatek-nt35510.c +1
-3@@ -956,9 +956,7 @@ static int nt35510_probe(struct mipi_dsi_device *dsi) nt->panel.backlight = bl; } - ret =drm_panel_add (&nt->panel); -if (ret <0 ) -return ret; +drm_panel_add (&nt->panel); ret =mipi_dsi_attach (dsi);if (ret <0 )drivers/gpu/drm/panel/panel-novatek-nt39016.c +1
-5@@ -303,11 +303,7 @@ static int nt39016_probe(struct spi_device *spi)drm_panel_init (&panel->drm_panel, dev, &nt39016_funcs,DRM_MODE_CONNECTOR_DPI ); - err =drm_panel_add (&panel->drm_panel); -if (err <0 ) { -dev_err (dev,"Failed to register panel" ); -return err; - } +drm_panel_add (&panel->drm_panel);return 0 ; }drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c +3
-1@@ -284,7 +284,9 @@ static int lcd_olinuxino_probe(struct i2c_client *client,if (ret)return ret; -return drm_panel_add (&lcd->panel); +drm_panel_add (&lcd->panel); + +return 0 ; }static int lcd_olinuxino_remove (struct i2c_client *client)drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c +3
-1@@ -165,7 +165,9 @@ static int osd101t2587_panel_add(struct osd101t2587_panel *osd101t2587)if (ret)return ret; -return drm_panel_add (&osd101t2587->base); +drm_panel_add (&osd101t2587->base); + +return 0 ; }static int osd101t2587_panel_probe (struct mipi_dsi_device *dsi)drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c +3
-1@@ -207,7 +207,9 @@ static int wuxga_nt_panel_add(struct wuxga_nt_panel *wuxga_nt)if (ret)return ret; -return drm_panel_add (&wuxga_nt->base); +drm_panel_add (&wuxga_nt->base); + +return 0 ; }static void wuxga_nt_panel_del (struct wuxga_nt_panel *wuxga_nt)drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +1
-3@@ -429,9 +429,7 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c,/* This appears last, as it's what will unblock the DSI host * driver's component bind function. */ - ret =drm_panel_add (&ts->base); -if (ret) -return ret; +drm_panel_add (&ts->base);return 0 ;drivers/gpu/drm/panel/panel-raydium-rm67191.c +1
-3@@ -610,9 +610,7 @@ static int rad_panel_probe(struct mipi_dsi_device *dsi) DRM_MODE_CONNECTOR_DSI);dev_set_drvdata (dev, panel); - ret =drm_panel_add (&panel->panel); -if (ret) -return ret; +drm_panel_add (&panel->panel); ret =mipi_dsi_attach (dsi);if (ret)drivers/gpu/drm/panel/panel-ronbo-rb070d30.c +1
-3@@ -201,9 +201,7 @@ static int rb070d30_panel_dsi_probe(struct mipi_dsi_device *dsi)if (ret)return ret; - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&ctx->panel); dsi->mode_flags =MIPI_DSI_MODE_VIDEO |MIPI_DSI_MODE_VIDEO_BURST |MIPI_DSI_MODE_LPM ; dsi->format =MIPI_DSI_FMT_RGB888 ;drivers/gpu/drm/panel/panel-samsung-ld9040.c +3
-1@@ -354,7 +354,9 @@ static int ld9040_probe(struct spi_device *spi)drm_panel_init (&ctx->panel, dev, &ld9040_drm_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&ctx->panel); +drm_panel_add (&ctx->panel); + +return 0 ; }static int ld9040_remove (struct spi_device *spi)drivers/gpu/drm/panel/panel-samsung-s6d16d0.c +1
-3@@ -218,9 +218,7 @@ static int s6d16d0_probe(struct mipi_dsi_device *dsi)drm_panel_init (&s6->panel, dev, &s6d16d0_drm_funcs,DRM_MODE_CONNECTOR_DSI ); - ret =drm_panel_add (&s6->panel); -if (ret <0 ) -return ret; +drm_panel_add (&s6->panel); ret =mipi_dsi_attach (dsi);if (ret <0 )drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c +1
-3@@ -735,9 +735,7 @@ static int s6e3ha2_probe(struct mipi_dsi_device *dsi)drm_panel_init (&ctx->panel, dev, &s6e3ha2_drm_funcs,DRM_MODE_CONNECTOR_DSI ); - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) - goto unregister_backlight; +drm_panel_add (&ctx->panel); ret =mipi_dsi_attach (dsi);if (ret <0 )drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c +1
-3@@ -480,9 +480,7 @@ static int s6e63j0x03_probe(struct mipi_dsi_device *dsi) ctx->bl_dev->props.brightness =DEFAULT_BRIGHTNESS ; ctx->bl_dev->props.power =FB_BLANK_POWERDOWN ; - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) - goto unregister_backlight; +drm_panel_add (&ctx->panel); ret =mipi_dsi_attach (dsi);if (ret <0 )drivers/gpu/drm/panel/panel-samsung-s6e63m0.c +3
-1@@ -480,7 +480,9 @@ static int s6e63m0_probe(struct spi_device *spi)if (ret <0 )return ret; -return drm_panel_add (&ctx->panel); +drm_panel_add (&ctx->panel); + +return 0 ; }static int s6e63m0_remove (struct spi_device *spi)drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams452ef01.c +1
-5@@ -243,11 +243,7 @@ static int s6e88a0_ams452ef01_probe(struct mipi_dsi_device *dsi)drm_panel_init (&ctx->panel, dev, &s6e88a0_ams452ef01_panel_funcs,DRM_MODE_CONNECTOR_DSI ); - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) { -dev_err (dev,"Failed to add panel: %d\n" , ret); -return ret; - } +drm_panel_add (&ctx->panel); ret =mipi_dsi_attach (dsi);if (ret <0 ) {drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c +1
-3@@ -1020,9 +1020,7 @@ static int s6e8aa0_probe(struct mipi_dsi_device *dsi)drm_panel_init (&ctx->panel, dev, &s6e8aa0_drm_funcs,DRM_MODE_CONNECTOR_DSI ); - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&ctx->panel); ret =mipi_dsi_attach (dsi);if (ret <0 )drivers/gpu/drm/panel/panel-seiko-43wvf1g.c +1
-3@@ -257,9 +257,7 @@ static int seiko_panel_probe(struct device *dev,if (err)return err; - err =drm_panel_add (&panel->base); -if (err <0 ) -return err; +drm_panel_add (&panel->base);dev_set_drvdata (dev, panel);drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c +3
-1@@ -326,7 +326,9 @@ static int sharp_panel_add(struct sharp_panel *sharp)if (ret)return ret; -return drm_panel_add (&sharp->base); +drm_panel_add (&sharp->base); + +return 0 ; }static void sharp_panel_del (struct sharp_panel *sharp)drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c +3
-1@@ -188,7 +188,9 @@ static int ls037v7dw01_probe(struct platform_device *pdev)drm_panel_init (&lcd->panel, &pdev->dev, &ls037v7dw01_funcs,DRM_MODE_CONNECTOR_DPI ); -return drm_panel_add (&lcd->panel); +drm_panel_add (&lcd->panel); + +return 0 ; }static int ls037v7dw01_remove (struct platform_device *pdev)drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c +3
-1@@ -262,7 +262,9 @@ static int sharp_nt_panel_add(struct sharp_nt_panel *sharp_nt)if (ret)return ret; -return drm_panel_add (&sharp_nt->base); +drm_panel_add (&sharp_nt->base); + +return 0 ; }static void sharp_nt_panel_del (struct sharp_nt_panel *sharp_nt)drivers/gpu/drm/panel/panel-simple.c +1
-3@@ -555,9 +555,7 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc)if (err) goto free_ddc; - err =drm_panel_add (&panel->base); -if (err <0 ) - goto free_ddc; +drm_panel_add (&panel->base);dev_set_drvdata (dev, panel);drivers/gpu/drm/panel/panel-sitronix-st7701.c +1
-3@@ -380,9 +380,7 @@ static int st7701_dsi_probe(struct mipi_dsi_device *dsi)if (ret)return ret; - ret =drm_panel_add (&st7701->panel); -if (ret <0 ) -return ret; +drm_panel_add (&st7701->panel);mipi_dsi_set_drvdata (dsi, st7701); st7701->dsi = dsi;drivers/gpu/drm/panel/panel-sitronix-st7789v.c +1
-3@@ -383,9 +383,7 @@ static int st7789v_probe(struct spi_device *spi)if (ret)return ret; - ret =drm_panel_add (&ctx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&ctx->panel);return 0 ; }drivers/gpu/drm/panel/panel-sony-acx424akp.c +1
-3@@ -506,9 +506,7 @@ static int acx424akp_probe(struct mipi_dsi_device *dsi) acx->bl->props.brightness =512 ; acx->bl->props.power =FB_BLANK_POWERDOWN ; - ret =drm_panel_add (&acx->panel); -if (ret <0 ) -return ret; +drm_panel_add (&acx->panel); ret =mipi_dsi_attach (dsi);if (ret <0 ) {drivers/gpu/drm/panel/panel-sony-acx565akm.c +1
-6@@ -651,12 +651,7 @@ static int acx565akm_probe(struct spi_device *spi)drm_panel_init (&lcd->panel, &lcd->spi->dev, &acx565akm_funcs,DRM_MODE_CONNECTOR_DPI ); - ret =drm_panel_add (&lcd->panel); -if (ret <0 ) { -if (lcd->has_bc) -acx565akm_backlight_cleanup (lcd); -return ret; - } +drm_panel_add (&lcd->panel);return 0 ; }drivers/gpu/drm/panel/panel-tpo-td028ttec1.c +3
-1@@ -351,7 +351,9 @@ static int td028ttec1_probe(struct spi_device *spi)if (ret)return ret; -return drm_panel_add (&lcd->panel); +drm_panel_add (&lcd->panel); + +return 0 ; }static int td028ttec1_remove (struct spi_device *spi)drivers/gpu/drm/panel/panel-tpo-td043mtea1.c +1
-5@@ -461,11 +461,7 @@ static int td043mtea1_probe(struct spi_device *spi)drm_panel_init (&lcd->panel, &lcd->spi->dev, &td043mtea1_funcs,DRM_MODE_CONNECTOR_DPI ); - ret =drm_panel_add (&lcd->panel); -if (ret <0 ) { -sysfs_remove_group (&spi->dev.kobj, &td043mtea1_attr_group); -return ret; - } +drm_panel_add (&lcd->panel);return 0 ; }drivers/gpu/drm/panel/panel-tpo-tpg110.c +3
-1@@ -453,7 +453,9 @@ static int tpg110_probe(struct spi_device *spi)spi_set_drvdata (spi, tpg); -return drm_panel_add (&tpg->panel); +drm_panel_add (&tpg->panel); + +return 0 ; }static int tpg110_remove (struct spi_device *spi)include/drm/drm_panel.h +1
-1@@ -175,7 +175,7 @@ void drm_panel_init(struct drm_panel *panel, struct device *dev,const struct drm_panel_funcs *funcs, int connector_type); -int drm_panel_add (struct drm_panel *panel); +void drm_panel_add (struct drm_panel *panel);void drm_panel_remove (struct drm_panel *panel);int drm_panel_attach (struct drm_panel *panel,struct drm_connector *connector);Signature · 1 line
2.17.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/1 drm: Remove unnecessary drm_panel_attach and drm_panel_detach
These functions are now empty and no longer
useful so remove the functions and their uses.
---
It's too tedious to break apart into multiple patches. Done with coccinelle and typing.
Compiled allyesconfig x86-64 only.
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 12 -------- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 ------ drivers/gpu/drm/bridge/nxp-ptn3460.c | 3 -- drivers/gpu/drm/bridge/panel.c | 7 ----- drivers/gpu/drm/bridge/parade-ps8622.c | 3 -- drivers/gpu/drm/bridge/tc358764.c | 2 -- drivers/gpu/drm/bridge/tc358767.c | 3 -- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 3 -- drivers/gpu/drm/drm_panel.c | 36 ---------------------- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 6 ---- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 7 ++--- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 7 ----- drivers/gpu/drm/imx/imx-ldb.c | 10 ------ drivers/gpu/drm/imx/parallel-display.c | 6 ---- .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 7 +---- drivers/gpu/drm/msm/dsi/dsi_manager.c | 1 - drivers/gpu/drm/mxsfb/mxsfb_drv.c | 7 +---- drivers/gpu/drm/mxsfb/mxsfb_out.c | 6 ---- drivers/gpu/drm/omapdrm/omap_drv.c | 15 --------- drivers/gpu/drm/rcar-du/rcar_lvds.c | 6 +--- drivers/gpu/drm/rockchip/rockchip_lvds.c | 9 ------ drivers/gpu/drm/sti/sti_dvo.c | 2 -- drivers/gpu/drm/sun4i/sun4i_lvds.c | 7 ----- drivers/gpu/drm/sun4i/sun4i_rgb.c | 7 ----- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 -- drivers/gpu/drm/tegra/dsi.c | 4 +-- drivers/gpu/drm/tegra/output.c | 10 ------ include/drm/drm_panel.h | 3 -- 28 files changed, 6 insertions(+), 194 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +0 -12
@@ -507,10 +507,6 @@ static const struct drm_connector_helper_funcs anx6345_connector_helper_funcs =static void anx6345_connector_destroy (struct drm_connector *connector) { -struct anx6345 *anx6345 =connector_to_anx6345 (connector); - -if (anx6345->panel) -drm_panel_detach (anx6345->panel);drm_connector_cleanup (connector); }
@@ -575,14 +571,6 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge,return err; } -if (anx6345->panel) { - err =drm_panel_attach (anx6345->panel, &anx6345->connector); -if (err) { -DRM_ERROR ("Failed to attach panel: %d\n" , err); -return err; - } - } -return 0 ; }
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +0 -9
@@ -1265,14 +1265,6 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge, } } -if (dp->plat_data->panel) { - ret =drm_panel_attach (dp->plat_data->panel, &dp->connector); -if (ret) { -DRM_ERROR ("Failed to attach panel\n" ); -return ret; - } - } -return 0 ; }
@@ -1803,7 +1795,6 @@ void analogix_dp_unbind(struct analogix_dp_device *dp)if (dp->plat_data->panel) {if (drm_panel_unprepare (dp->plat_data->panel))DRM_ERROR ("failed to turnoff the panel\n" ); -drm_panel_detach (dp->plat_data->panel); }drm_dp_aux_unregister (&dp->aux);
drivers/gpu/drm/bridge/nxp-ptn3460.c +0 -3
@@ -265,9 +265,6 @@ static int ptn3460_bridge_attach(struct drm_bridge *bridge,drm_connector_attach_encoder (&ptn_bridge->connector, bridge->encoder); -if (ptn_bridge->panel) -drm_panel_attach (ptn_bridge->panel, &ptn_bridge->connector); -drm_helper_hpd_irq_event (ptn_bridge->connector.dev);return ret;
drivers/gpu/drm/bridge/panel.c +0 -7
@@ -82,18 +82,11 @@ static int panel_bridge_attach(struct drm_bridge *bridge,drm_connector_attach_encoder (&panel_bridge->connector, bridge->encoder); - ret =drm_panel_attach (panel_bridge->panel, &panel_bridge->connector); -if (ret <0 ) -return ret; -return 0 ; }static void panel_bridge_detach (struct drm_bridge *bridge) { -struct panel_bridge *panel_bridge =drm_bridge_to_panel_bridge (bridge); - -drm_panel_detach (panel_bridge->panel); }static void panel_bridge_pre_enable (struct drm_bridge *bridge)
drivers/gpu/drm/bridge/parade-ps8622.c +0 -3
@@ -505,9 +505,6 @@ static int ps8622_attach(struct drm_bridge *bridge,drm_connector_attach_encoder (&ps8622->connector, bridge->encoder); -if (ps8622->panel) -drm_panel_attach (ps8622->panel, &ps8622->connector); -drm_helper_hpd_irq_event (ps8622->connector.dev);return ret;
drivers/gpu/drm/bridge/tc358764.c +0 -2
@@ -373,7 +373,6 @@ static int tc358764_attach(struct drm_bridge *bridge,drm_connector_helper_add (&ctx->connector, &tc358764_connector_helper_funcs);drm_connector_attach_encoder (&ctx->connector, bridge->encoder); -drm_panel_attach (ctx->panel, &ctx->connector); ctx->connector.funcs->reset (&ctx->connector);drm_connector_register (&ctx->connector);
@@ -385,7 +384,6 @@ static void tc358764_detach(struct drm_bridge *bridge)struct tc358764 *ctx =bridge_to_tc358764 (bridge);drm_connector_unregister (&ctx->connector); -drm_panel_detach (ctx->panel); ctx->panel =NULL ;drm_connector_put (&ctx->connector); }
drivers/gpu/drm/bridge/tc358767.c +0 -3
@@ -1435,9 +1435,6 @@ static int tc_bridge_attach(struct drm_bridge *bridge,DRM_CONNECTOR_POLL_DISCONNECT ; } -if (tc->panel) -drm_panel_attach (tc->panel, &tc->connector); -drm_display_info_set_bus_formats (&tc->connector.display_info, &bus_format,1 ); tc->connector.display_info.bus_flags =
drivers/gpu/drm/bridge/ti-sn65dsi86.c +0 -3
@@ -394,9 +394,6 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, } pdata->dsi = dsi; -/* attach panel to bridge */ -drm_panel_attach (pdata->panel, &pdata->connector); -return 0 ; err_dsi_attach:
drivers/gpu/drm/drm_panel.c +0 -36
@@ -97,42 +97,6 @@ void drm_panel_remove(struct drm_panel *panel) }EXPORT_SYMBOL (drm_panel_remove); -/** -* drm_panel_attach - attach a panel to a connector -* @panel: DRM panel -* @connector: DRM connector -* -* After obtaining a pointer to a DRM panel a display driver calls this -* function to attach a panel to a connector. -* -* An error is returned if the panel is already attached to another connector. -* -* When unloading, the driver should detach from the panel by calling -* drm_panel_detach(). -* -* Return: 0 on success or a negative error code on failure. -*/ -int drm_panel_attach (struct drm_panel *panel,struct drm_connector *connector) -{ -return 0 ; -} -EXPORT_SYMBOL (drm_panel_attach); - -/** -* drm_panel_detach - detach a panel from a connector -* @panel: DRM panel -* -* Detaches a panel from the connector it is attached to. If a panel is not -* attached to any connector this is effectively a no-op. -* -* This function should not be called by the panel device itself. It -* is only for the drm device that called drm_panel_attach(). -*/ -void drm_panel_detach (struct drm_panel *panel) -{ -} -EXPORT_SYMBOL (drm_panel_detach); -/** * drm_panel_prepare - power on a panel * @panel: DRM panel
drivers/gpu/drm/exynos/exynos_drm_dpi.c +0 -6
@@ -44,9 +44,6 @@ exynos_dpi_detect(struct drm_connector *connector, bool force) {struct exynos_dpi *ctx =connector_to_dpi (connector); -if (ctx->panel) -drm_panel_attach (ctx->panel, &ctx->connector); -return connector_status_connected; }
@@ -249,8 +246,5 @@ int exynos_dpi_remove(struct drm_encoder *encoder)exynos_dpi_disable (&ctx->encoder); -if (ctx->panel) -drm_panel_detach (ctx->panel); -return 0 ; }
drivers/gpu/drm/exynos/exynos_drm_dsi.c +2 -5
@@ -1551,12 +1551,10 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host, } dsi->panel =of_drm_find_panel (device->dev.of_node); -if (IS_ERR (dsi->panel)) { +if (IS_ERR (dsi->panel)) dsi->panel =NULL ; - }else { -drm_panel_attach (dsi->panel, &dsi->connector); +else dsi->connector.status = connector_status_connected; - } }/*
@@ -1596,7 +1594,6 @@ static int exynos_dsi_host_detach(struct mipi_dsi_host *host,if (dsi->panel) {mutex_lock (&drm->mode_config.mutex);exynos_dsi_disable (&dsi->encoder); -drm_panel_detach (dsi->panel); dsi->panel =NULL ; dsi->connector.status = connector_status_disconnected;mutex_unlock (&drm->mode_config.mutex);
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c +0 -7
@@ -43,7 +43,6 @@ static void fsl_dcu_drm_connector_destroy(struct drm_connector *connector)struct fsl_dcu_drm_connector *fsl_con =to_fsl_dcu_connector (connector);drm_connector_unregister (connector); -drm_panel_detach (fsl_con->panel);drm_connector_cleanup (connector); }
@@ -101,12 +100,6 @@ static int fsl_dcu_attach_panel(struct fsl_dcu_drm_device *fsl_dev,if (ret <0 ) goto err_sysfs; - ret =drm_panel_attach (panel, connector); -if (ret) { -dev_err (fsl_dev->dev,"failed to attach panel\n" ); - goto err_sysfs; - } -return 0 ; err_sysfs:
drivers/gpu/drm/imx/imx-ldb.c +0 -10
@@ -455,13 +455,6 @@ static int imx_ldb_register(struct drm_device *drm,drm_connector_attach_encoder (&imx_ldb_ch->connector, encoder); } -if (imx_ldb_ch->panel) { - ret =drm_panel_attach (imx_ldb_ch->panel, - &imx_ldb_ch->connector); -if (ret) -return ret; - } -return 0 ; }
@@ -702,9 +695,6 @@ static void imx_ldb_unbind(struct device *dev, struct device *master,for (i =0 ; i <2 ; i++) {struct imx_ldb_channel *channel = &imx_ldb->channel[i]; -if (channel->panel) -drm_panel_detach (channel->panel); -kfree (channel->edid);i2c_put_adapter (channel->ddc); }
drivers/gpu/drm/imx/parallel-display.c +0 -6
@@ -289,9 +289,6 @@ static int imx_pd_register(struct drm_device *drm, DRM_MODE_CONNECTOR_DPI); } -if (imxpd->panel) -drm_panel_attach (imxpd->panel, &imxpd->connector); -if (imxpd->next_bridge) { ret =drm_bridge_attach (encoder, imxpd->next_bridge, &imxpd->bridge,0 );
@@ -357,9 +354,6 @@ static void imx_pd_unbind(struct device *dev, struct device *master, {struct imx_parallel_display *imxpd =dev_get_drvdata (dev); -if (imxpd->panel) -drm_panel_detach (imxpd->panel); -kfree (imxpd->edid); }
drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +1 -6
@@ -50,14 +50,9 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector)struct drm_panel *panel = mdp4_lvds_connector->panel;int ret =0 ; -if (panel) { -drm_panel_attach (panel, connector); - +if (panel) ret =drm_panel_get_modes (panel, connector); -drm_panel_detach (panel); - } -return ret; }
drivers/gpu/drm/msm/dsi/dsi_manager.c +0 -1
@@ -328,7 +328,6 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector)* In dual DSI mode, we have one connector that can be * attached to the drm_panel. */ -drm_panel_attach (panel, connector); num =drm_panel_get_modes (panel, connector);if (!num)return 0 ;
drivers/gpu/drm/mxsfb/mxsfb_drv.c +1 -6
@@ -265,11 +265,7 @@ static int mxsfb_load(struct drm_device *drm)*/ if (mxsfb->panel) { - ret =drm_panel_attach (mxsfb->panel, mxsfb->connector); -if (ret) { -dev_err (drm->dev,"Cannot connect panel: %d\n" , ret); - goto err_vblank; - } + ; }else if (mxsfb->bridge) { ret =drm_simple_display_pipe_attach_bridge (&mxsfb->pipe, mxsfb->bridge);
@@ -306,7 +302,6 @@ static int mxsfb_load(struct drm_device *drm)return 0 ; err_irq: -drm_panel_detach (mxsfb->panel); err_vblank:pm_runtime_disable (drm->dev);
drivers/gpu/drm/mxsfb/mxsfb_out.c +0 -6
@@ -55,12 +55,6 @@ mxsfb_panel_connector_detect(struct drm_connector *connector, bool force)static void mxsfb_panel_connector_destroy (struct drm_connector *connector) { -struct mxsfb_drm_private *mxsfb = -drm_connector_to_mxsfb_drm_private (connector); - -if (mxsfb->panel) -drm_panel_detach (mxsfb->panel); -drm_connector_unregister (connector);drm_connector_cleanup (connector); }
drivers/gpu/drm/omapdrm/omap_drv.c +0 -15
@@ -349,13 +349,6 @@ static int omap_modeset_init(struct drm_device *dev)drm_connector_attach_encoder (pipe->connector, encoder); -if (pipe->output->panel) { - ret =drm_panel_attach (pipe->output->panel, - pipe->connector); -if (ret <0 ) -return ret; - } - crtc =omap_crtc_init (dev, pipe, priv->planes[i]);if (IS_ERR (crtc))return PTR_ERR (crtc);
@@ -395,17 +388,9 @@ static int omap_modeset_init(struct drm_device *dev)static void omap_modeset_fini (struct drm_device *ddev) {struct omap_drm_private *priv = ddev->dev_private; -unsigned int i;omap_drm_irq_uninstall (ddev); -for (i =0 ; i < priv->num_pipes; i++) { -struct omap_drm_pipeline *pipe = &priv->pipes[i]; - -if (pipe->output->panel) -drm_panel_detach (pipe->output->panel); - } -drm_mode_config_cleanup (ddev); }
drivers/gpu/drm/rcar-du/rcar_lvds.c +1 -5
@@ -677,15 +677,11 @@ static int rcar_lvds_attach(struct drm_bridge *bridge,if (ret <0 )return ret; -return drm_panel_attach (lvds->panel, connector); +return 0 ; }static void rcar_lvds_detach (struct drm_bridge *bridge) { -struct rcar_lvds *lvds =bridge_to_rcar_lvds (bridge); - -if (lvds->panel) -drm_panel_detach (lvds->panel); }static const struct drm_bridge_funcs rcar_lvds_bridge_ops = {
drivers/gpu/drm/rockchip/rockchip_lvds.c +0 -9
@@ -634,13 +634,6 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master, "failed to attach encoder: %d\n", ret); goto err_free_connector; } - - ret =drm_panel_attach (lvds->panel, connector); -if (ret <0 ) { -DRM_DEV_ERROR (drm_dev->dev, -"failed to attach panel: %d\n" , ret); - goto err_free_connector; - } }else { ret =drm_bridge_attach (encoder, lvds->bridge,NULL ,0 );if (ret) {
@@ -676,8 +669,6 @@ static void rockchip_lvds_unbind(struct device *dev, struct device *master, encoder_funcs = lvds->soc_data->helper_funcs; encoder_funcs->disable (&lvds->encoder); -if (lvds->panel) -drm_panel_detach (lvds->panel);pm_runtime_disable (dev);drm_connector_cleanup (&lvds->connector);drm_encoder_cleanup (&lvds->encoder);
drivers/gpu/drm/sti/sti_dvo.c +0 -2
@@ -389,8 +389,6 @@ sti_dvo_connector_detect(struct drm_connector *connector, bool force) dvo->panel =of_drm_find_panel (dvo->panel_node);if (IS_ERR (dvo->panel)) dvo->panel =NULL ; -else -drm_panel_attach (dvo->panel, connector); }if (dvo->panel)
drivers/gpu/drm/sun4i/sun4i_lvds.c +0 -7
@@ -56,7 +56,6 @@ sun4i_lvds_connector_destroy(struct drm_connector *connector) {struct sun4i_lvds *lvds =drm_connector_to_sun4i_lvds (connector); -drm_panel_detach (lvds->panel);drm_connector_cleanup (connector); }
@@ -141,12 +140,6 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)drm_connector_attach_encoder (&lvds->connector, &lvds->encoder); - - ret =drm_panel_attach (lvds->panel, &lvds->connector); -if (ret) { -dev_err (drm->dev,"Couldn't attach our panel\n" ); - goto err_cleanup_connector; - } }if (bridge) {
drivers/gpu/drm/sun4i/sun4i_rgb.c +0 -7
@@ -147,7 +147,6 @@ sun4i_rgb_connector_destroy(struct drm_connector *connector) {struct sun4i_rgb *rgb =drm_connector_to_sun4i_rgb (connector); -drm_panel_detach (rgb->panel);drm_connector_cleanup (connector); }
@@ -233,12 +232,6 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon)drm_connector_attach_encoder (&rgb->connector, &rgb->encoder); - - ret =drm_panel_attach (rgb->panel, &rgb->connector); -if (ret) { -dev_err (drm->dev,"Couldn't attach our panel\n" ); - goto err_cleanup_connector; - } }if (rgb->bridge) {
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +0 -2
@@ -973,7 +973,6 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, dsi->panel = panel; dsi->device = device; -drm_panel_attach (dsi->panel, &dsi->connector);drm_kms_helper_hotplug_event (dsi->drm);dev_info (host->dev,"Attached device %s\n" , device->name);
@@ -990,7 +989,6 @@ static int sun6i_dsi_detach(struct mipi_dsi_host *host, dsi->panel =NULL ; dsi->device =NULL ; -drm_panel_detach (panel);drm_kms_helper_hotplug_event (dsi->drm);return 0 ;
drivers/gpu/drm/tegra/dsi.c +1 -3
@@ -1498,10 +1498,8 @@ static int tegra_dsi_host_attach(struct mipi_dsi_host *host,if (IS_ERR (output->panel)) output->panel =NULL ; -if (output->panel && output->connector.dev) { -drm_panel_attach (output->panel, &output->connector); +if (output->panel && output->connector.dev)drm_helper_hpd_irq_event (output->connector.dev); - } }return 0 ;
drivers/gpu/drm/tegra/output.c +0 -10
@@ -179,13 +179,6 @@ void tegra_output_remove(struct tegra_output *output)int tegra_output_init (struct drm_device *drm,struct tegra_output *output) {int connector_type; -int err; - -if (output->panel) { - err =drm_panel_attach (output->panel, &output->connector); -if (err <0 ) -return err; - }/* * The connector is now registered and ready to receive hotplug events
@@ -220,9 +213,6 @@ void tegra_output_exit(struct tegra_output *output)*/ if (output->hpd_gpio)disable_irq (output->hpd_irq); - -if (output->panel) -drm_panel_detach (output->panel); } void tegra_output_find_possible_crtcs(struct tegra_output *output,
include/drm/drm_panel.h +0 -3
@@ -178,9 +178,6 @@ void drm_panel_init(struct drm_panel *panel, struct device *dev,int drm_panel_add (struct drm_panel *panel);void drm_panel_remove (struct drm_panel *panel); -int drm_panel_attach (struct drm_panel *panel,struct drm_connector *connector); -void drm_panel_detach (struct drm_panel *panel); -int drm_panel_prepare (struct drm_panel *panel);int drm_panel_unprepare (struct drm_panel *panel);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH] drm: Remove unnecessary drm_panel_attach and drm_panel_detach
Hi Joe.
Quoted 10 lines · Joe Perches
These functions are now empty and no longer
useful so remove the functions and their uses.Signed-off-by Joe Perches <[email protected]>---
It's too tedious to break apart into multiple patches. Done with coccinelle and typing.
Compiled allyesconfig x86-64 only.
Thanks for doing this.
But patch fails to apply for drm-misc-next where we put this kind of changes. I managed to apply it with some rejects.
There is several warnings like these when building for arm. I did not build it all as my build failed too.
drivers/gpu/drm/omapdrm/omap_drv.c: In function ‘omap_modeset_fini’:drivers/gpu/drm/omapdrm/omap_drv.c:390:27: warning: unused variable ‘priv’ [-Wunused-variable]
struct omap_drm_private *priv = ddev->dev_private;
drivers/gpu/drm/exynos/exynos_drm_dpi.c: In function ‘exynos_dpi_detect’:drivers/gpu/drm/exynos/exynos_drm_dpi.c:45:21: warning: unused variable ‘ctx’ [-Wunused-variable]
struct exynos_dpi *ctx = connector_to_dpi(connector);
^~~
drivers/gpu/drm/sun4i/sun4i_lvds.c: In function ‘sun4i_lvds_connector_destroy’:
drivers/gpu/drm/sun4i/sun4i_lvds.c:57:21: warning: unused variable ‘lvds’ [-Wunused-variable]
struct sun4i_lvds *lvds = drm_connector_to_sun4i_lvds(connector);
^~~~I know you can do better than this. Care to give it an extra spin?
Sam
Quoted 651 lines
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 12 -------- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 ------ drivers/gpu/drm/bridge/nxp-ptn3460.c | 3 -- drivers/gpu/drm/bridge/panel.c | 7 ----- drivers/gpu/drm/bridge/parade-ps8622.c | 3 -- drivers/gpu/drm/bridge/tc358764.c | 2 -- drivers/gpu/drm/bridge/tc358767.c | 3 -- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 3 -- drivers/gpu/drm/drm_panel.c | 36 ---------------------- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 6 ---- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 7 ++--- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 7 ----- drivers/gpu/drm/imx/imx-ldb.c | 10 ------ drivers/gpu/drm/imx/parallel-display.c | 6 ---- .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 7 +---- drivers/gpu/drm/msm/dsi/dsi_manager.c | 1 - drivers/gpu/drm/mxsfb/mxsfb_drv.c | 7 +---- drivers/gpu/drm/mxsfb/mxsfb_out.c | 6 ---- drivers/gpu/drm/omapdrm/omap_drv.c | 15 --------- drivers/gpu/drm/rcar-du/rcar_lvds.c | 6 +--- drivers/gpu/drm/rockchip/rockchip_lvds.c | 9 ------ drivers/gpu/drm/sti/sti_dvo.c | 2 -- drivers/gpu/drm/sun4i/sun4i_lvds.c | 7 ----- drivers/gpu/drm/sun4i/sun4i_rgb.c | 7 ----- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 -- drivers/gpu/drm/tegra/dsi.c | 4 +-- drivers/gpu/drm/tegra/output.c | 10 ------ include/drm/drm_panel.h | 3 -- 28 files changed, 6 insertions(+), 194 deletions(-)drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +0
-12@@ -507,10 +507,6 @@ static const struct drm_connector_helper_funcs anx6345_connector_helper_funcs =static void anx6345_connector_destroy (struct drm_connector *connector) { -struct anx6345 *anx6345 =connector_to_anx6345 (connector); - -if (anx6345->panel) -drm_panel_detach (anx6345->panel);drm_connector_cleanup (connector); }@@ -575,14 +571,6 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge,return err; } -if (anx6345->panel) { - err =drm_panel_attach (anx6345->panel, &anx6345->connector); -if (err) { -DRM_ERROR ("Failed to attach panel: %d\n" , err); -return err; - } - } -return 0 ; }drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +0
-9@@ -1265,14 +1265,6 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge, } } -if (dp->plat_data->panel) { - ret =drm_panel_attach (dp->plat_data->panel, &dp->connector); -if (ret) { -DRM_ERROR ("Failed to attach panel\n" ); -return ret; - } - } -return 0 ; }@@ -1803,7 +1795,6 @@ void analogix_dp_unbind(struct analogix_dp_device *dp)if (dp->plat_data->panel) {if (drm_panel_unprepare (dp->plat_data->panel))DRM_ERROR ("failed to turnoff the panel\n" ); -drm_panel_detach (dp->plat_data->panel); }drm_dp_aux_unregister (&dp->aux);drivers/gpu/drm/bridge/nxp-ptn3460.c +0
-3@@ -265,9 +265,6 @@ static int ptn3460_bridge_attach(struct drm_bridge *bridge,drm_connector_attach_encoder (&ptn_bridge->connector, bridge->encoder); -if (ptn_bridge->panel) -drm_panel_attach (ptn_bridge->panel, &ptn_bridge->connector); -drm_helper_hpd_irq_event (ptn_bridge->connector.dev);return ret;drivers/gpu/drm/bridge/panel.c +0
-7@@ -82,18 +82,11 @@ static int panel_bridge_attach(struct drm_bridge *bridge,drm_connector_attach_encoder (&panel_bridge->connector, bridge->encoder); - ret =drm_panel_attach (panel_bridge->panel, &panel_bridge->connector); -if (ret <0 ) -return ret; -return 0 ; }static void panel_bridge_detach (struct drm_bridge *bridge) { -struct panel_bridge *panel_bridge =drm_bridge_to_panel_bridge (bridge); - -drm_panel_detach (panel_bridge->panel); }static void panel_bridge_pre_enable (struct drm_bridge *bridge)drivers/gpu/drm/bridge/parade-ps8622.c +0
-3@@ -505,9 +505,6 @@ static int ps8622_attach(struct drm_bridge *bridge,drm_connector_attach_encoder (&ps8622->connector, bridge->encoder); -if (ps8622->panel) -drm_panel_attach (ps8622->panel, &ps8622->connector); -drm_helper_hpd_irq_event (ps8622->connector.dev);return ret;drivers/gpu/drm/bridge/tc358764.c +0
-2@@ -373,7 +373,6 @@ static int tc358764_attach(struct drm_bridge *bridge,drm_connector_helper_add (&ctx->connector, &tc358764_connector_helper_funcs);drm_connector_attach_encoder (&ctx->connector, bridge->encoder); -drm_panel_attach (ctx->panel, &ctx->connector); ctx->connector.funcs->reset (&ctx->connector);drm_connector_register (&ctx->connector);@@ -385,7 +384,6 @@ static void tc358764_detach(struct drm_bridge *bridge)struct tc358764 *ctx =bridge_to_tc358764 (bridge);drm_connector_unregister (&ctx->connector); -drm_panel_detach (ctx->panel); ctx->panel =NULL ;drm_connector_put (&ctx->connector); }drivers/gpu/drm/bridge/tc358767.c +0
-3@@ -1435,9 +1435,6 @@ static int tc_bridge_attach(struct drm_bridge *bridge,DRM_CONNECTOR_POLL_DISCONNECT ; } -if (tc->panel) -drm_panel_attach (tc->panel, &tc->connector); -drm_display_info_set_bus_formats (&tc->connector.display_info, &bus_format,1 ); tc->connector.display_info.bus_flags =drivers/gpu/drm/bridge/ti-sn65dsi86.c +0
-3@@ -394,9 +394,6 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, } pdata->dsi = dsi; -/* attach panel to bridge */ -drm_panel_attach (pdata->panel, &pdata->connector); -return 0 ; err_dsi_attach:drivers/gpu/drm/drm_panel.c +0
-36@@ -97,42 +97,6 @@ void drm_panel_remove(struct drm_panel *panel) }EXPORT_SYMBOL (drm_panel_remove); -/** -* drm_panel_attach - attach a panel to a connector -* @panel: DRM panel -* @connector: DRM connector -* -* After obtaining a pointer to a DRM panel a display driver calls this -* function to attach a panel to a connector. -* -* An error is returned if the panel is already attached to another connector. -* -* When unloading, the driver should detach from the panel by calling -* drm_panel_detach(). -* -* Return: 0 on success or a negative error code on failure. -*/ -int drm_panel_attach (struct drm_panel *panel,struct drm_connector *connector) -{ -return 0 ; -} -EXPORT_SYMBOL (drm_panel_attach); - -/** -* drm_panel_detach - detach a panel from a connector -* @panel: DRM panel -* -* Detaches a panel from the connector it is attached to. If a panel is not -* attached to any connector this is effectively a no-op. -* -* This function should not be called by the panel device itself. It -* is only for the drm device that called drm_panel_attach(). -*/ -void drm_panel_detach (struct drm_panel *panel) -{ -} -EXPORT_SYMBOL (drm_panel_detach); -/** * drm_panel_prepare - power on a panel * @panel: DRM panel drivers/gpu/drm/exynos/exynos_drm_dpi.c +0
-6@@ -44,9 +44,6 @@ exynos_dpi_detect(struct drm_connector *connector, bool force) {struct exynos_dpi *ctx =connector_to_dpi (connector); -if (ctx->panel) -drm_panel_attach (ctx->panel, &ctx->connector); -return connector_status_connected; }@@ -249,8 +246,5 @@ int exynos_dpi_remove(struct drm_encoder *encoder)exynos_dpi_disable (&ctx->encoder); -if (ctx->panel) -drm_panel_detach (ctx->panel); -return 0 ; }drivers/gpu/drm/exynos/exynos_drm_dsi.c +2
-5@@ -1551,12 +1551,10 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host, } dsi->panel =of_drm_find_panel (device->dev.of_node); -if (IS_ERR (dsi->panel)) { +if (IS_ERR (dsi->panel)) dsi->panel =NULL ; - }else { -drm_panel_attach (dsi->panel, &dsi->connector); +else dsi->connector.status = connector_status_connected; - } }/* @@ -1596,7 +1594,6 @@ static int exynos_dsi_host_detach(struct mipi_dsi_host *host,if (dsi->panel) {mutex_lock (&drm->mode_config.mutex);exynos_dsi_disable (&dsi->encoder); -drm_panel_detach (dsi->panel); dsi->panel =NULL ; dsi->connector.status = connector_status_disconnected;mutex_unlock (&drm->mode_config.mutex);drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c +0
-7@@ -43,7 +43,6 @@ static void fsl_dcu_drm_connector_destroy(struct drm_connector *connector)struct fsl_dcu_drm_connector *fsl_con =to_fsl_dcu_connector (connector);drm_connector_unregister (connector); -drm_panel_detach (fsl_con->panel);drm_connector_cleanup (connector); }@@ -101,12 +100,6 @@ static int fsl_dcu_attach_panel(struct fsl_dcu_drm_device *fsl_dev,if (ret <0 ) goto err_sysfs; - ret =drm_panel_attach (panel, connector); -if (ret) { -dev_err (fsl_dev->dev,"failed to attach panel\n" ); - goto err_sysfs; - } -return 0 ; err_sysfs:drivers/gpu/drm/imx/imx-ldb.c +0
-10@@ -455,13 +455,6 @@ static int imx_ldb_register(struct drm_device *drm,drm_connector_attach_encoder (&imx_ldb_ch->connector, encoder); } -if (imx_ldb_ch->panel) { - ret =drm_panel_attach (imx_ldb_ch->panel, - &imx_ldb_ch->connector); -if (ret) -return ret; - } -return 0 ; }@@ -702,9 +695,6 @@ static void imx_ldb_unbind(struct device *dev, struct device *master,for (i =0 ; i <2 ; i++) {struct imx_ldb_channel *channel = &imx_ldb->channel[i]; -if (channel->panel) -drm_panel_detach (channel->panel); -kfree (channel->edid);i2c_put_adapter (channel->ddc); }drivers/gpu/drm/imx/parallel-display.c +0
-6@@ -289,9 +289,6 @@ static int imx_pd_register(struct drm_device *drm, DRM_MODE_CONNECTOR_DPI); } -if (imxpd->panel) -drm_panel_attach (imxpd->panel, &imxpd->connector); -if (imxpd->next_bridge) { ret =drm_bridge_attach (encoder, imxpd->next_bridge, &imxpd->bridge,0 );@@ -357,9 +354,6 @@ static void imx_pd_unbind(struct device *dev, struct device *master, {struct imx_parallel_display *imxpd =dev_get_drvdata (dev); -if (imxpd->panel) -drm_panel_detach (imxpd->panel); -kfree (imxpd->edid); }drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +1
-6@@ -50,14 +50,9 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector)struct drm_panel *panel = mdp4_lvds_connector->panel;int ret =0 ; -if (panel) { -drm_panel_attach (panel, connector); - +if (panel) ret =drm_panel_get_modes (panel, connector); -drm_panel_detach (panel); - } -return ret; }drivers/gpu/drm/msm/dsi/dsi_manager.c +0
-1@@ -328,7 +328,6 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector)* In dual DSI mode, we have one connector that can be * attached to the drm_panel. */ -drm_panel_attach (panel, connector); num =drm_panel_get_modes (panel, connector);if (!num)return 0 ;drivers/gpu/drm/mxsfb/mxsfb_drv.c +1
-6@@ -265,11 +265,7 @@ static int mxsfb_load(struct drm_device *drm)*/ if (mxsfb->panel) { - ret =drm_panel_attach (mxsfb->panel, mxsfb->connector); -if (ret) { -dev_err (drm->dev,"Cannot connect panel: %d\n" , ret); - goto err_vblank; - } + ; }else if (mxsfb->bridge) { ret =drm_simple_display_pipe_attach_bridge (&mxsfb->pipe, mxsfb->bridge);@@ -306,7 +302,6 @@ static int mxsfb_load(struct drm_device *drm)return 0 ; err_irq: -drm_panel_detach (mxsfb->panel); err_vblank:pm_runtime_disable (drm->dev);drivers/gpu/drm/mxsfb/mxsfb_out.c +0
-6@@ -55,12 +55,6 @@ mxsfb_panel_connector_detect(struct drm_connector *connector, bool force)static void mxsfb_panel_connector_destroy (struct drm_connector *connector) { -struct mxsfb_drm_private *mxsfb = -drm_connector_to_mxsfb_drm_private (connector); - -if (mxsfb->panel) -drm_panel_detach (mxsfb->panel); -drm_connector_unregister (connector);drm_connector_cleanup (connector); }drivers/gpu/drm/omapdrm/omap_drv.c +0
-15@@ -349,13 +349,6 @@ static int omap_modeset_init(struct drm_device *dev)drm_connector_attach_encoder (pipe->connector, encoder); -if (pipe->output->panel) { - ret =drm_panel_attach (pipe->output->panel, - pipe->connector); -if (ret <0 ) -return ret; - } - crtc =omap_crtc_init (dev, pipe, priv->planes[i]);if (IS_ERR (crtc))return PTR_ERR (crtc);@@ -395,17 +388,9 @@ static int omap_modeset_init(struct drm_device *dev)static void omap_modeset_fini (struct drm_device *ddev) {struct omap_drm_private *priv = ddev->dev_private; -unsigned int i;omap_drm_irq_uninstall (ddev); -for (i =0 ; i < priv->num_pipes; i++) { -struct omap_drm_pipeline *pipe = &priv->pipes[i]; - -if (pipe->output->panel) -drm_panel_detach (pipe->output->panel); - } -drm_mode_config_cleanup (ddev); }drivers/gpu/drm/rcar-du/rcar_lvds.c +1
-5@@ -677,15 +677,11 @@ static int rcar_lvds_attach(struct drm_bridge *bridge,if (ret <0 )return ret; -return drm_panel_attach (lvds->panel, connector); +return 0 ; }static void rcar_lvds_detach (struct drm_bridge *bridge) { -struct rcar_lvds *lvds =bridge_to_rcar_lvds (bridge); - -if (lvds->panel) -drm_panel_detach (lvds->panel); }static const struct drm_bridge_funcs rcar_lvds_bridge_ops = {drivers/gpu/drm/rockchip/rockchip_lvds.c +0
-9@@ -634,13 +634,6 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master, "failed to attach encoder: %d\n", ret); goto err_free_connector; } - - ret =drm_panel_attach (lvds->panel, connector); -if (ret <0 ) { -DRM_DEV_ERROR (drm_dev->dev, -"failed to attach panel: %d\n" , ret); - goto err_free_connector; - } }else { ret =drm_bridge_attach (encoder, lvds->bridge,NULL ,0 );if (ret) {@@ -676,8 +669,6 @@ static void rockchip_lvds_unbind(struct device *dev, struct device *master, encoder_funcs = lvds->soc_data->helper_funcs; encoder_funcs->disable (&lvds->encoder); -if (lvds->panel) -drm_panel_detach (lvds->panel);pm_runtime_disable (dev);drm_connector_cleanup (&lvds->connector);drm_encoder_cleanup (&lvds->encoder);drivers/gpu/drm/sti/sti_dvo.c +0
-2@@ -389,8 +389,6 @@ sti_dvo_connector_detect(struct drm_connector *connector, bool force) dvo->panel =of_drm_find_panel (dvo->panel_node);if (IS_ERR (dvo->panel)) dvo->panel =NULL ; -else -drm_panel_attach (dvo->panel, connector); }if (dvo->panel)drivers/gpu/drm/sun4i/sun4i_lvds.c +0
-7@@ -56,7 +56,6 @@ sun4i_lvds_connector_destroy(struct drm_connector *connector) {struct sun4i_lvds *lvds =drm_connector_to_sun4i_lvds (connector); -drm_panel_detach (lvds->panel);drm_connector_cleanup (connector); }@@ -141,12 +140,6 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)drm_connector_attach_encoder (&lvds->connector, &lvds->encoder); - - ret =drm_panel_attach (lvds->panel, &lvds->connector); -if (ret) { -dev_err (drm->dev,"Couldn't attach our panel\n" ); - goto err_cleanup_connector; - } }if (bridge) {drivers/gpu/drm/sun4i/sun4i_rgb.c +0
-7@@ -147,7 +147,6 @@ sun4i_rgb_connector_destroy(struct drm_connector *connector) {struct sun4i_rgb *rgb =drm_connector_to_sun4i_rgb (connector); -drm_panel_detach (rgb->panel);drm_connector_cleanup (connector); }@@ -233,12 +232,6 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon)drm_connector_attach_encoder (&rgb->connector, &rgb->encoder); - - ret =drm_panel_attach (rgb->panel, &rgb->connector); -if (ret) { -dev_err (drm->dev,"Couldn't attach our panel\n" ); - goto err_cleanup_connector; - } }if (rgb->bridge) {drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +0
-2@@ -973,7 +973,6 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, dsi->panel = panel; dsi->device = device; -drm_panel_attach (dsi->panel, &dsi->connector);drm_kms_helper_hotplug_event (dsi->drm);dev_info (host->dev,"Attached device %s\n" , device->name);@@ -990,7 +989,6 @@ static int sun6i_dsi_detach(struct mipi_dsi_host *host, dsi->panel =NULL ; dsi->device =NULL ; -drm_panel_detach (panel);drm_kms_helper_hotplug_event (dsi->drm);return 0 ;drivers/gpu/drm/tegra/dsi.c +1
-3@@ -1498,10 +1498,8 @@ static int tegra_dsi_host_attach(struct mipi_dsi_host *host,if (IS_ERR (output->panel)) output->panel =NULL ; -if (output->panel && output->connector.dev) { -drm_panel_attach (output->panel, &output->connector); +if (output->panel && output->connector.dev)drm_helper_hpd_irq_event (output->connector.dev); - } }return 0 ;drivers/gpu/drm/tegra/output.c +0
-10@@ -179,13 +179,6 @@ void tegra_output_remove(struct tegra_output *output)int tegra_output_init (struct drm_device *drm,struct tegra_output *output) {int connector_type; -int err; - -if (output->panel) { - err =drm_panel_attach (output->panel, &output->connector); -if (err <0 ) -return err; - }/* * The connector is now registered and ready to receive hotplug events @@ -220,9 +213,6 @@ void tegra_output_exit(struct tegra_output *output)*/ if (output->hpd_gpio)disable_irq (output->hpd_irq); - -if (output->panel) -drm_panel_detach (output->panel); } void tegra_output_find_possible_crtcs(struct tegra_output *output,include/drm/drm_panel.h +0
-0
include/drm/drm_panel.h void drm_panel_init(struct drm_panel *panel, struct device *dev, · line 183
Quoted 9 lines
include/drm/drm_panel.h +0
-3@@ -178,9 +178,6 @@ void drm_panel_init(struct drm_panel *panel, struct device *dev,int drm_panel_add (struct drm_panel *panel);void drm_panel_remove (struct drm_panel *panel); -int drm_panel_attach (struct drm_panel *panel,struct drm_connector *connector); -void drm_panel_detach (struct drm_panel *panel); -int drm_panel_prepare (struct drm_panel *panel);int drm_panel_unprepare (struct drm_panel *panel);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/1 drm: Remove unnecessary drm_panel_attach and drm_panel_detach
These functions are now empty and no longer
useful so remove the functions and their uses.
---
Quoted 4 lines
Quoted 4 lines
It's too tedious to break apart into multiple patches. Done with coccinelle and typing.
Compiled allyesconfig x86-64 only.
V2: Removed 3 additional lines
drivers/gpu/drm/omapdrm/omap_drv.c:390:27: warning: unused variable ‘priv’ [-Wunused-variable] drivers/gpu/drm/exynos/exynos_drm_dpi.c:45:21: warning: unused variable ‘ctx’ [-Wunused-variable] drivers/gpu/drm/sun4i/sun4i_lvds.c:57:21: warning: unused variable ‘lvds’ [-Wunused-variable]
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 12 -------- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 ------ drivers/gpu/drm/bridge/nxp-ptn3460.c | 3 -- drivers/gpu/drm/bridge/panel.c | 7 ----- drivers/gpu/drm/bridge/parade-ps8622.c | 3 -- drivers/gpu/drm/bridge/tc358764.c | 2 -- drivers/gpu/drm/bridge/tc358767.c | 3 -- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 3 -- drivers/gpu/drm/drm_panel.c | 36 ---------------------- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 8 ----- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 7 ++--- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 7 ----- drivers/gpu/drm/imx/imx-ldb.c | 10 ------ drivers/gpu/drm/imx/parallel-display.c | 6 ---- .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 7 +---- drivers/gpu/drm/msm/dsi/dsi_manager.c | 1 - drivers/gpu/drm/mxsfb/mxsfb_drv.c | 7 +---- drivers/gpu/drm/mxsfb/mxsfb_out.c | 6 ---- drivers/gpu/drm/omapdrm/omap_drv.c | 17 ---------- drivers/gpu/drm/rcar-du/rcar_lvds.c | 6 +--- drivers/gpu/drm/rockchip/rockchip_lvds.c | 9 ------ drivers/gpu/drm/sti/sti_dvo.c | 2 -- drivers/gpu/drm/sun4i/sun4i_lvds.c | 9 ------ drivers/gpu/drm/sun4i/sun4i_rgb.c | 7 ----- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 -- drivers/gpu/drm/tegra/dsi.c | 4 +-- drivers/gpu/drm/tegra/output.c | 10 ------ include/drm/drm_panel.h | 3 -- 28 files changed, 6 insertions(+), 200 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +0 -12
@@ -507,10 +507,6 @@ static const struct drm_connector_helper_funcs anx6345_connector_helper_funcs =static void anx6345_connector_destroy (struct drm_connector *connector) { -struct anx6345 *anx6345 =connector_to_anx6345 (connector); - -if (anx6345->panel) -drm_panel_detach (anx6345->panel);drm_connector_cleanup (connector); }
@@ -575,14 +571,6 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge,return err; } -if (anx6345->panel) { - err =drm_panel_attach (anx6345->panel, &anx6345->connector); -if (err) { -DRM_ERROR ("Failed to attach panel: %d\n" , err); -return err; - } - } -return 0 ; }
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +0 -9
@@ -1265,14 +1265,6 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge, } } -if (dp->plat_data->panel) { - ret =drm_panel_attach (dp->plat_data->panel, &dp->connector); -if (ret) { -DRM_ERROR ("Failed to attach panel\n" ); -return ret; - } - } -return 0 ; }
@@ -1803,7 +1795,6 @@ void analogix_dp_unbind(struct analogix_dp_device *dp)if (dp->plat_data->panel) {if (drm_panel_unprepare (dp->plat_data->panel))DRM_ERROR ("failed to turnoff the panel\n" ); -drm_panel_detach (dp->plat_data->panel); }drm_dp_aux_unregister (&dp->aux);
drivers/gpu/drm/bridge/nxp-ptn3460.c +0 -3
@@ -265,9 +265,6 @@ static int ptn3460_bridge_attach(struct drm_bridge *bridge,drm_connector_attach_encoder (&ptn_bridge->connector, bridge->encoder); -if (ptn_bridge->panel) -drm_panel_attach (ptn_bridge->panel, &ptn_bridge->connector); -drm_helper_hpd_irq_event (ptn_bridge->connector.dev);return ret;
drivers/gpu/drm/bridge/panel.c +0 -7
@@ -82,18 +82,11 @@ static int panel_bridge_attach(struct drm_bridge *bridge,drm_connector_attach_encoder (&panel_bridge->connector, bridge->encoder); - ret =drm_panel_attach (panel_bridge->panel, &panel_bridge->connector); -if (ret <0 ) -return ret; -return 0 ; }static void panel_bridge_detach (struct drm_bridge *bridge) { -struct panel_bridge *panel_bridge =drm_bridge_to_panel_bridge (bridge); - -drm_panel_detach (panel_bridge->panel); }static void panel_bridge_pre_enable (struct drm_bridge *bridge)
drivers/gpu/drm/bridge/parade-ps8622.c +0 -3
@@ -505,9 +505,6 @@ static int ps8622_attach(struct drm_bridge *bridge,drm_connector_attach_encoder (&ps8622->connector, bridge->encoder); -if (ps8622->panel) -drm_panel_attach (ps8622->panel, &ps8622->connector); -drm_helper_hpd_irq_event (ps8622->connector.dev);return ret;
drivers/gpu/drm/bridge/tc358764.c +0 -2
@@ -373,7 +373,6 @@ static int tc358764_attach(struct drm_bridge *bridge,drm_connector_helper_add (&ctx->connector, &tc358764_connector_helper_funcs);drm_connector_attach_encoder (&ctx->connector, bridge->encoder); -drm_panel_attach (ctx->panel, &ctx->connector); ctx->connector.funcs->reset (&ctx->connector);drm_connector_register (&ctx->connector);
@@ -385,7 +384,6 @@ static void tc358764_detach(struct drm_bridge *bridge)struct tc358764 *ctx =bridge_to_tc358764 (bridge);drm_connector_unregister (&ctx->connector); -drm_panel_detach (ctx->panel); ctx->panel =NULL ;drm_connector_put (&ctx->connector); }
drivers/gpu/drm/bridge/tc358767.c +0 -3
@@ -1435,9 +1435,6 @@ static int tc_bridge_attach(struct drm_bridge *bridge,DRM_CONNECTOR_POLL_DISCONNECT ; } -if (tc->panel) -drm_panel_attach (tc->panel, &tc->connector); -drm_display_info_set_bus_formats (&tc->connector.display_info, &bus_format,1 ); tc->connector.display_info.bus_flags =
drivers/gpu/drm/bridge/ti-sn65dsi86.c +0 -3
@@ -394,9 +394,6 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, } pdata->dsi = dsi; -/* attach panel to bridge */ -drm_panel_attach (pdata->panel, &pdata->connector); -return 0 ; err_dsi_attach:
drivers/gpu/drm/drm_panel.c +0 -36
@@ -97,42 +97,6 @@ void drm_panel_remove(struct drm_panel *panel) }EXPORT_SYMBOL (drm_panel_remove); -/** -* drm_panel_attach - attach a panel to a connector -* @panel: DRM panel -* @connector: DRM connector -* -* After obtaining a pointer to a DRM panel a display driver calls this -* function to attach a panel to a connector. -* -* An error is returned if the panel is already attached to another connector. -* -* When unloading, the driver should detach from the panel by calling -* drm_panel_detach(). -* -* Return: 0 on success or a negative error code on failure. -*/ -int drm_panel_attach (struct drm_panel *panel,struct drm_connector *connector) -{ -return 0 ; -} -EXPORT_SYMBOL (drm_panel_attach); - -/** -* drm_panel_detach - detach a panel from a connector -* @panel: DRM panel -* -* Detaches a panel from the connector it is attached to. If a panel is not -* attached to any connector this is effectively a no-op. -* -* This function should not be called by the panel device itself. It -* is only for the drm device that called drm_panel_attach(). -*/ -void drm_panel_detach (struct drm_panel *panel) -{ -} -EXPORT_SYMBOL (drm_panel_detach); -/** * drm_panel_prepare - power on a panel * @panel: DRM panel
drivers/gpu/drm/exynos/exynos_drm_dpi.c +0 -8
@@ -42,11 +42,6 @@ static inline struct exynos_dpi *encoder_to_dpi(struct drm_encoder *e)static enum drm_connector_status exynos_dpi_detect (struct drm_connector *connector,bool force) { -struct exynos_dpi *ctx =connector_to_dpi (connector); - -if (ctx->panel) -drm_panel_attach (ctx->panel, &ctx->connector); -return connector_status_connected; }
@@ -249,8 +244,5 @@ int exynos_dpi_remove(struct drm_encoder *encoder)exynos_dpi_disable (&ctx->encoder); -if (ctx->panel) -drm_panel_detach (ctx->panel); -return 0 ; }
drivers/gpu/drm/exynos/exynos_drm_dsi.c +2 -5
@@ -1551,12 +1551,10 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host, } dsi->panel =of_drm_find_panel (device->dev.of_node); -if (IS_ERR (dsi->panel)) { +if (IS_ERR (dsi->panel)) dsi->panel =NULL ; - }else { -drm_panel_attach (dsi->panel, &dsi->connector); +else dsi->connector.status = connector_status_connected; - } }/*
@@ -1596,7 +1594,6 @@ static int exynos_dsi_host_detach(struct mipi_dsi_host *host,if (dsi->panel) {mutex_lock (&drm->mode_config.mutex);exynos_dsi_disable (&dsi->encoder); -drm_panel_detach (dsi->panel); dsi->panel =NULL ; dsi->connector.status = connector_status_disconnected;mutex_unlock (&drm->mode_config.mutex);
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c +0 -7
@@ -43,7 +43,6 @@ static void fsl_dcu_drm_connector_destroy(struct drm_connector *connector)struct fsl_dcu_drm_connector *fsl_con =to_fsl_dcu_connector (connector);drm_connector_unregister (connector); -drm_panel_detach (fsl_con->panel);drm_connector_cleanup (connector); }
@@ -101,12 +100,6 @@ static int fsl_dcu_attach_panel(struct fsl_dcu_drm_device *fsl_dev,if (ret <0 ) goto err_sysfs; - ret =drm_panel_attach (panel, connector); -if (ret) { -dev_err (fsl_dev->dev,"failed to attach panel\n" ); - goto err_sysfs; - } -return 0 ; err_sysfs:
drivers/gpu/drm/imx/imx-ldb.c +0 -10
@@ -455,13 +455,6 @@ static int imx_ldb_register(struct drm_device *drm,drm_connector_attach_encoder (&imx_ldb_ch->connector, encoder); } -if (imx_ldb_ch->panel) { - ret =drm_panel_attach (imx_ldb_ch->panel, - &imx_ldb_ch->connector); -if (ret) -return ret; - } -return 0 ; }
@@ -702,9 +695,6 @@ static void imx_ldb_unbind(struct device *dev, struct device *master,for (i =0 ; i <2 ; i++) {struct imx_ldb_channel *channel = &imx_ldb->channel[i]; -if (channel->panel) -drm_panel_detach (channel->panel); -kfree (channel->edid);i2c_put_adapter (channel->ddc); }
drivers/gpu/drm/imx/parallel-display.c +0 -6
@@ -289,9 +289,6 @@ static int imx_pd_register(struct drm_device *drm, DRM_MODE_CONNECTOR_DPI); } -if (imxpd->panel) -drm_panel_attach (imxpd->panel, &imxpd->connector); -if (imxpd->next_bridge) { ret =drm_bridge_attach (encoder, imxpd->next_bridge, &imxpd->bridge,0 );
@@ -357,9 +354,6 @@ static void imx_pd_unbind(struct device *dev, struct device *master, {struct imx_parallel_display *imxpd =dev_get_drvdata (dev); -if (imxpd->panel) -drm_panel_detach (imxpd->panel); -kfree (imxpd->edid); }
drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +1 -6
@@ -50,14 +50,9 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector)struct drm_panel *panel = mdp4_lvds_connector->panel;int ret =0 ; -if (panel) { -drm_panel_attach (panel, connector); - +if (panel) ret =drm_panel_get_modes (panel, connector); -drm_panel_detach (panel); - } -return ret; }
drivers/gpu/drm/msm/dsi/dsi_manager.c +0 -1
@@ -328,7 +328,6 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector)* In dual DSI mode, we have one connector that can be * attached to the drm_panel. */ -drm_panel_attach (panel, connector); num =drm_panel_get_modes (panel, connector);if (!num)return 0 ;
drivers/gpu/drm/mxsfb/mxsfb_drv.c +1 -6
@@ -265,11 +265,7 @@ static int mxsfb_load(struct drm_device *drm)*/ if (mxsfb->panel) { - ret =drm_panel_attach (mxsfb->panel, mxsfb->connector); -if (ret) { -dev_err (drm->dev,"Cannot connect panel: %d\n" , ret); - goto err_vblank; - } + ; }else if (mxsfb->bridge) { ret =drm_simple_display_pipe_attach_bridge (&mxsfb->pipe, mxsfb->bridge);
@@ -306,7 +302,6 @@ static int mxsfb_load(struct drm_device *drm)return 0 ; err_irq: -drm_panel_detach (mxsfb->panel); err_vblank:pm_runtime_disable (drm->dev);
drivers/gpu/drm/mxsfb/mxsfb_out.c +0 -6
@@ -55,12 +55,6 @@ mxsfb_panel_connector_detect(struct drm_connector *connector, bool force)static void mxsfb_panel_connector_destroy (struct drm_connector *connector) { -struct mxsfb_drm_private *mxsfb = -drm_connector_to_mxsfb_drm_private (connector); - -if (mxsfb->panel) -drm_panel_detach (mxsfb->panel); -drm_connector_unregister (connector);drm_connector_cleanup (connector); }
drivers/gpu/drm/omapdrm/omap_drv.c +0 -17
@@ -349,13 +349,6 @@ static int omap_modeset_init(struct drm_device *dev)drm_connector_attach_encoder (pipe->connector, encoder); -if (pipe->output->panel) { - ret =drm_panel_attach (pipe->output->panel, - pipe->connector); -if (ret <0 ) -return ret; - } - crtc =omap_crtc_init (dev, pipe, priv->planes[i]);if (IS_ERR (crtc))return PTR_ERR (crtc);
@@ -394,18 +387,8 @@ static int omap_modeset_init(struct drm_device *dev)static void omap_modeset_fini (struct drm_device *ddev) { -struct omap_drm_private *priv = ddev->dev_private; -unsigned int i; -omap_drm_irq_uninstall (ddev); -for (i =0 ; i < priv->num_pipes; i++) { -struct omap_drm_pipeline *pipe = &priv->pipes[i]; - -if (pipe->output->panel) -drm_panel_detach (pipe->output->panel); - } -drm_mode_config_cleanup (ddev); }
drivers/gpu/drm/rcar-du/rcar_lvds.c +1 -5
@@ -677,15 +677,11 @@ static int rcar_lvds_attach(struct drm_bridge *bridge,if (ret <0 )return ret; -return drm_panel_attach (lvds->panel, connector); +return 0 ; }static void rcar_lvds_detach (struct drm_bridge *bridge) { -struct rcar_lvds *lvds =bridge_to_rcar_lvds (bridge); - -if (lvds->panel) -drm_panel_detach (lvds->panel); }static const struct drm_bridge_funcs rcar_lvds_bridge_ops = {
drivers/gpu/drm/rockchip/rockchip_lvds.c +0 -9
@@ -634,13 +634,6 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master, "failed to attach encoder: %d\n", ret); goto err_free_connector; } - - ret =drm_panel_attach (lvds->panel, connector); -if (ret <0 ) { -DRM_DEV_ERROR (drm_dev->dev, -"failed to attach panel: %d\n" , ret); - goto err_free_connector; - } }else { ret =drm_bridge_attach (encoder, lvds->bridge,NULL ,0 );if (ret) {
@@ -676,8 +669,6 @@ static void rockchip_lvds_unbind(struct device *dev, struct device *master, encoder_funcs = lvds->soc_data->helper_funcs; encoder_funcs->disable (&lvds->encoder); -if (lvds->panel) -drm_panel_detach (lvds->panel);pm_runtime_disable (dev);drm_connector_cleanup (&lvds->connector);drm_encoder_cleanup (&lvds->encoder);
drivers/gpu/drm/sti/sti_dvo.c +0 -2
@@ -389,8 +389,6 @@ sti_dvo_connector_detect(struct drm_connector *connector, bool force) dvo->panel =of_drm_find_panel (dvo->panel_node);if (IS_ERR (dvo->panel)) dvo->panel =NULL ; -else -drm_panel_attach (dvo->panel, connector); }if (dvo->panel)
drivers/gpu/drm/sun4i/sun4i_lvds.c +0 -9
@@ -54,9 +54,6 @@ static struct drm_connector_helper_funcs sun4i_lvds_con_helper_funcs = {static void sun4i_lvds_connector_destroy (struct drm_connector *connector) { -struct sun4i_lvds *lvds =drm_connector_to_sun4i_lvds (connector); - -drm_panel_detach (lvds->panel);drm_connector_cleanup (connector); }
@@ -141,12 +138,6 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)drm_connector_attach_encoder (&lvds->connector, &lvds->encoder); - - ret =drm_panel_attach (lvds->panel, &lvds->connector); -if (ret) { -dev_err (drm->dev,"Couldn't attach our panel\n" ); - goto err_cleanup_connector; - } }if (bridge) {
drivers/gpu/drm/sun4i/sun4i_rgb.c +0 -7
@@ -147,7 +147,6 @@ sun4i_rgb_connector_destroy(struct drm_connector *connector) {struct sun4i_rgb *rgb =drm_connector_to_sun4i_rgb (connector); -drm_panel_detach (rgb->panel);drm_connector_cleanup (connector); }
@@ -233,12 +232,6 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon)drm_connector_attach_encoder (&rgb->connector, &rgb->encoder); - - ret =drm_panel_attach (rgb->panel, &rgb->connector); -if (ret) { -dev_err (drm->dev,"Couldn't attach our panel\n" ); - goto err_cleanup_connector; - } }if (rgb->bridge) {
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +0 -2
@@ -973,7 +973,6 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, dsi->panel = panel; dsi->device = device; -drm_panel_attach (dsi->panel, &dsi->connector);drm_kms_helper_hotplug_event (dsi->drm);dev_info (host->dev,"Attached device %s\n" , device->name);
@@ -990,7 +989,6 @@ static int sun6i_dsi_detach(struct mipi_dsi_host *host, dsi->panel =NULL ; dsi->device =NULL ; -drm_panel_detach (panel);drm_kms_helper_hotplug_event (dsi->drm);return 0 ;
drivers/gpu/drm/tegra/dsi.c +1 -3
@@ -1498,10 +1498,8 @@ static int tegra_dsi_host_attach(struct mipi_dsi_host *host,if (IS_ERR (output->panel)) output->panel =NULL ; -if (output->panel && output->connector.dev) { -drm_panel_attach (output->panel, &output->connector); +if (output->panel && output->connector.dev)drm_helper_hpd_irq_event (output->connector.dev); - } }return 0 ;
drivers/gpu/drm/tegra/output.c +0 -10
@@ -179,13 +179,6 @@ void tegra_output_remove(struct tegra_output *output)int tegra_output_init (struct drm_device *drm,struct tegra_output *output) {int connector_type; -int err; - -if (output->panel) { - err =drm_panel_attach (output->panel, &output->connector); -if (err <0 ) -return err; - }/* * The connector is now registered and ready to receive hotplug events
@@ -220,9 +213,6 @@ void tegra_output_exit(struct tegra_output *output)*/ if (output->hpd_gpio)disable_irq (output->hpd_irq); - -if (output->panel) -drm_panel_detach (output->panel); } void tegra_output_find_possible_crtcs(struct tegra_output *output,
include/drm/drm_panel.h +0 -3
@@ -178,9 +178,6 @@ void drm_panel_init(struct drm_panel *panel, struct device *dev,int drm_panel_add (struct drm_panel *panel);void drm_panel_remove (struct drm_panel *panel); -int drm_panel_attach (struct drm_panel *panel,struct drm_connector *connector); -void drm_panel_detach (struct drm_panel *panel); -int drm_panel_prepare (struct drm_panel *panel);int drm_panel_unprepare (struct drm_panel *panel);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH V2] drm: Remove unnecessary drm_panel_attach and drm_panel_detach
Hi Joe.
Quoted 9 lines · Joe Perches
These functions are now empty and no longer
useful so remove the functions and their uses.Signed-off-by Joe Perches <[email protected]>---
Quoted 3 lines
Quoted 3 lines
It's too tedious to break apart into multiple patches. Done with coccinelle and typing.
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Compiled allyesconfig x86-64 only.
V2: Removed 3 additional lines
drivers/gpu/drm/omapdrm/omap_drv.c:390:27: warning: unused variable ‘priv’ [-Wunused-variable]drivers/gpu/drm/exynos/exynos_drm_dpi.c:45:21: warning: unused variable ‘ctx’ [-Wunused-variable]drivers/gpu/drm/sun4i/sun4i_lvds.c:57:21: warning: unused variable ‘lvds’ [-Wunused-variable]
Thanks, better now.
I had to fix a few warnings and a build error to get it going on drm-misc-next. I will keep it locally just to let anyone speak up. I you do not see any mail from me until friday that it is applied please ping me.
Sam
Quoted 656 lines
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 12 -------- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 ------ drivers/gpu/drm/bridge/nxp-ptn3460.c | 3 -- drivers/gpu/drm/bridge/panel.c | 7 ----- drivers/gpu/drm/bridge/parade-ps8622.c | 3 -- drivers/gpu/drm/bridge/tc358764.c | 2 -- drivers/gpu/drm/bridge/tc358767.c | 3 -- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 3 -- drivers/gpu/drm/drm_panel.c | 36 ---------------------- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 8 ----- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 7 ++--- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 7 ----- drivers/gpu/drm/imx/imx-ldb.c | 10 ------ drivers/gpu/drm/imx/parallel-display.c | 6 ---- .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 7 +---- drivers/gpu/drm/msm/dsi/dsi_manager.c | 1 - drivers/gpu/drm/mxsfb/mxsfb_drv.c | 7 +---- drivers/gpu/drm/mxsfb/mxsfb_out.c | 6 ---- drivers/gpu/drm/omapdrm/omap_drv.c | 17 ---------- drivers/gpu/drm/rcar-du/rcar_lvds.c | 6 +--- drivers/gpu/drm/rockchip/rockchip_lvds.c | 9 ------ drivers/gpu/drm/sti/sti_dvo.c | 2 -- drivers/gpu/drm/sun4i/sun4i_lvds.c | 9 ------ drivers/gpu/drm/sun4i/sun4i_rgb.c | 7 ----- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 -- drivers/gpu/drm/tegra/dsi.c | 4 +-- drivers/gpu/drm/tegra/output.c | 10 ------ include/drm/drm_panel.h | 3 -- 28 files changed, 6 insertions(+), 200 deletions(-)drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +0
-12@@ -507,10 +507,6 @@ static const struct drm_connector_helper_funcs anx6345_connector_helper_funcs =static void anx6345_connector_destroy (struct drm_connector *connector) { -struct anx6345 *anx6345 =connector_to_anx6345 (connector); - -if (anx6345->panel) -drm_panel_detach (anx6345->panel);drm_connector_cleanup (connector); }@@ -575,14 +571,6 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge,return err; } -if (anx6345->panel) { - err =drm_panel_attach (anx6345->panel, &anx6345->connector); -if (err) { -DRM_ERROR ("Failed to attach panel: %d\n" , err); -return err; - } - } -return 0 ; }drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +0
-9@@ -1265,14 +1265,6 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge, } } -if (dp->plat_data->panel) { - ret =drm_panel_attach (dp->plat_data->panel, &dp->connector); -if (ret) { -DRM_ERROR ("Failed to attach panel\n" ); -return ret; - } - } -return 0 ; }@@ -1803,7 +1795,6 @@ void analogix_dp_unbind(struct analogix_dp_device *dp)if (dp->plat_data->panel) {if (drm_panel_unprepare (dp->plat_data->panel))DRM_ERROR ("failed to turnoff the panel\n" ); -drm_panel_detach (dp->plat_data->panel); }drm_dp_aux_unregister (&dp->aux);drivers/gpu/drm/bridge/nxp-ptn3460.c +0
-3@@ -265,9 +265,6 @@ static int ptn3460_bridge_attach(struct drm_bridge *bridge,drm_connector_attach_encoder (&ptn_bridge->connector, bridge->encoder); -if (ptn_bridge->panel) -drm_panel_attach (ptn_bridge->panel, &ptn_bridge->connector); -drm_helper_hpd_irq_event (ptn_bridge->connector.dev);return ret;drivers/gpu/drm/bridge/panel.c +0
-7@@ -82,18 +82,11 @@ static int panel_bridge_attach(struct drm_bridge *bridge,drm_connector_attach_encoder (&panel_bridge->connector, bridge->encoder); - ret =drm_panel_attach (panel_bridge->panel, &panel_bridge->connector); -if (ret <0 ) -return ret; -return 0 ; }static void panel_bridge_detach (struct drm_bridge *bridge) { -struct panel_bridge *panel_bridge =drm_bridge_to_panel_bridge (bridge); - -drm_panel_detach (panel_bridge->panel); }static void panel_bridge_pre_enable (struct drm_bridge *bridge)drivers/gpu/drm/bridge/parade-ps8622.c +0
-3@@ -505,9 +505,6 @@ static int ps8622_attach(struct drm_bridge *bridge,drm_connector_attach_encoder (&ps8622->connector, bridge->encoder); -if (ps8622->panel) -drm_panel_attach (ps8622->panel, &ps8622->connector); -drm_helper_hpd_irq_event (ps8622->connector.dev);return ret;drivers/gpu/drm/bridge/tc358764.c +0
-2@@ -373,7 +373,6 @@ static int tc358764_attach(struct drm_bridge *bridge,drm_connector_helper_add (&ctx->connector, &tc358764_connector_helper_funcs);drm_connector_attach_encoder (&ctx->connector, bridge->encoder); -drm_panel_attach (ctx->panel, &ctx->connector); ctx->connector.funcs->reset (&ctx->connector);drm_connector_register (&ctx->connector);@@ -385,7 +384,6 @@ static void tc358764_detach(struct drm_bridge *bridge)struct tc358764 *ctx =bridge_to_tc358764 (bridge);drm_connector_unregister (&ctx->connector); -drm_panel_detach (ctx->panel); ctx->panel =NULL ;drm_connector_put (&ctx->connector); }drivers/gpu/drm/bridge/tc358767.c +0
-3@@ -1435,9 +1435,6 @@ static int tc_bridge_attach(struct drm_bridge *bridge,DRM_CONNECTOR_POLL_DISCONNECT ; } -if (tc->panel) -drm_panel_attach (tc->panel, &tc->connector); -drm_display_info_set_bus_formats (&tc->connector.display_info, &bus_format,1 ); tc->connector.display_info.bus_flags =drivers/gpu/drm/bridge/ti-sn65dsi86.c +0
-3@@ -394,9 +394,6 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, } pdata->dsi = dsi; -/* attach panel to bridge */ -drm_panel_attach (pdata->panel, &pdata->connector); -return 0 ; err_dsi_attach:drivers/gpu/drm/drm_panel.c +0
-36@@ -97,42 +97,6 @@ void drm_panel_remove(struct drm_panel *panel) }EXPORT_SYMBOL (drm_panel_remove); -/** -* drm_panel_attach - attach a panel to a connector -* @panel: DRM panel -* @connector: DRM connector -* -* After obtaining a pointer to a DRM panel a display driver calls this -* function to attach a panel to a connector. -* -* An error is returned if the panel is already attached to another connector. -* -* When unloading, the driver should detach from the panel by calling -* drm_panel_detach(). -* -* Return: 0 on success or a negative error code on failure. -*/ -int drm_panel_attach (struct drm_panel *panel,struct drm_connector *connector) -{ -return 0 ; -} -EXPORT_SYMBOL (drm_panel_attach); - -/** -* drm_panel_detach - detach a panel from a connector -* @panel: DRM panel -* -* Detaches a panel from the connector it is attached to. If a panel is not -* attached to any connector this is effectively a no-op. -* -* This function should not be called by the panel device itself. It -* is only for the drm device that called drm_panel_attach(). -*/ -void drm_panel_detach (struct drm_panel *panel) -{ -} -EXPORT_SYMBOL (drm_panel_detach); -/** * drm_panel_prepare - power on a panel * @panel: DRM panel drivers/gpu/drm/exynos/exynos_drm_dpi.c +0
-8@@ -42,11 +42,6 @@ static inline struct exynos_dpi *encoder_to_dpi(struct drm_encoder *e)static enum drm_connector_status exynos_dpi_detect (struct drm_connector *connector,bool force) { -struct exynos_dpi *ctx =connector_to_dpi (connector); - -if (ctx->panel) -drm_panel_attach (ctx->panel, &ctx->connector); -return connector_status_connected; }@@ -249,8 +244,5 @@ int exynos_dpi_remove(struct drm_encoder *encoder)exynos_dpi_disable (&ctx->encoder); -if (ctx->panel) -drm_panel_detach (ctx->panel); -return 0 ; }drivers/gpu/drm/exynos/exynos_drm_dsi.c +2
-5@@ -1551,12 +1551,10 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host, } dsi->panel =of_drm_find_panel (device->dev.of_node); -if (IS_ERR (dsi->panel)) { +if (IS_ERR (dsi->panel)) dsi->panel =NULL ; - }else { -drm_panel_attach (dsi->panel, &dsi->connector); +else dsi->connector.status = connector_status_connected; - } }/* @@ -1596,7 +1594,6 @@ static int exynos_dsi_host_detach(struct mipi_dsi_host *host,if (dsi->panel) {mutex_lock (&drm->mode_config.mutex);exynos_dsi_disable (&dsi->encoder); -drm_panel_detach (dsi->panel); dsi->panel =NULL ; dsi->connector.status = connector_status_disconnected;mutex_unlock (&drm->mode_config.mutex);drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c +0
-7@@ -43,7 +43,6 @@ static void fsl_dcu_drm_connector_destroy(struct drm_connector *connector)struct fsl_dcu_drm_connector *fsl_con =to_fsl_dcu_connector (connector);drm_connector_unregister (connector); -drm_panel_detach (fsl_con->panel);drm_connector_cleanup (connector); }@@ -101,12 +100,6 @@ static int fsl_dcu_attach_panel(struct fsl_dcu_drm_device *fsl_dev,if (ret <0 ) goto err_sysfs; - ret =drm_panel_attach (panel, connector); -if (ret) { -dev_err (fsl_dev->dev,"failed to attach panel\n" ); - goto err_sysfs; - } -return 0 ; err_sysfs:drivers/gpu/drm/imx/imx-ldb.c +0
-10@@ -455,13 +455,6 @@ static int imx_ldb_register(struct drm_device *drm,drm_connector_attach_encoder (&imx_ldb_ch->connector, encoder); } -if (imx_ldb_ch->panel) { - ret =drm_panel_attach (imx_ldb_ch->panel, - &imx_ldb_ch->connector); -if (ret) -return ret; - } -return 0 ; }@@ -702,9 +695,6 @@ static void imx_ldb_unbind(struct device *dev, struct device *master,for (i =0 ; i <2 ; i++) {struct imx_ldb_channel *channel = &imx_ldb->channel[i]; -if (channel->panel) -drm_panel_detach (channel->panel); -kfree (channel->edid);i2c_put_adapter (channel->ddc); }drivers/gpu/drm/imx/parallel-display.c +0
-6@@ -289,9 +289,6 @@ static int imx_pd_register(struct drm_device *drm, DRM_MODE_CONNECTOR_DPI); } -if (imxpd->panel) -drm_panel_attach (imxpd->panel, &imxpd->connector); -if (imxpd->next_bridge) { ret =drm_bridge_attach (encoder, imxpd->next_bridge, &imxpd->bridge,0 );@@ -357,9 +354,6 @@ static void imx_pd_unbind(struct device *dev, struct device *master, {struct imx_parallel_display *imxpd =dev_get_drvdata (dev); -if (imxpd->panel) -drm_panel_detach (imxpd->panel); -kfree (imxpd->edid); }drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +1
-6@@ -50,14 +50,9 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector)struct drm_panel *panel = mdp4_lvds_connector->panel;int ret =0 ; -if (panel) { -drm_panel_attach (panel, connector); - +if (panel) ret =drm_panel_get_modes (panel, connector); -drm_panel_detach (panel); - } -return ret; }drivers/gpu/drm/msm/dsi/dsi_manager.c +0
-1@@ -328,7 +328,6 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector)* In dual DSI mode, we have one connector that can be * attached to the drm_panel. */ -drm_panel_attach (panel, connector); num =drm_panel_get_modes (panel, connector);if (!num)return 0 ;drivers/gpu/drm/mxsfb/mxsfb_drv.c +1
-6@@ -265,11 +265,7 @@ static int mxsfb_load(struct drm_device *drm)*/ if (mxsfb->panel) { - ret =drm_panel_attach (mxsfb->panel, mxsfb->connector); -if (ret) { -dev_err (drm->dev,"Cannot connect panel: %d\n" , ret); - goto err_vblank; - } + ; }else if (mxsfb->bridge) { ret =drm_simple_display_pipe_attach_bridge (&mxsfb->pipe, mxsfb->bridge);@@ -306,7 +302,6 @@ static int mxsfb_load(struct drm_device *drm)return 0 ; err_irq: -drm_panel_detach (mxsfb->panel); err_vblank:pm_runtime_disable (drm->dev);drivers/gpu/drm/mxsfb/mxsfb_out.c +0
-6@@ -55,12 +55,6 @@ mxsfb_panel_connector_detect(struct drm_connector *connector, bool force)static void mxsfb_panel_connector_destroy (struct drm_connector *connector) { -struct mxsfb_drm_private *mxsfb = -drm_connector_to_mxsfb_drm_private (connector); - -if (mxsfb->panel) -drm_panel_detach (mxsfb->panel); -drm_connector_unregister (connector);drm_connector_cleanup (connector); }drivers/gpu/drm/omapdrm/omap_drv.c +0
-17@@ -349,13 +349,6 @@ static int omap_modeset_init(struct drm_device *dev)drm_connector_attach_encoder (pipe->connector, encoder); -if (pipe->output->panel) { - ret =drm_panel_attach (pipe->output->panel, - pipe->connector); -if (ret <0 ) -return ret; - } - crtc =omap_crtc_init (dev, pipe, priv->planes[i]);if (IS_ERR (crtc))return PTR_ERR (crtc);@@ -394,18 +387,8 @@ static int omap_modeset_init(struct drm_device *dev)static void omap_modeset_fini (struct drm_device *ddev) { -struct omap_drm_private *priv = ddev->dev_private; -unsigned int i; -omap_drm_irq_uninstall (ddev); -for (i =0 ; i < priv->num_pipes; i++) { -struct omap_drm_pipeline *pipe = &priv->pipes[i]; - -if (pipe->output->panel) -drm_panel_detach (pipe->output->panel); - } -drm_mode_config_cleanup (ddev); }drivers/gpu/drm/rcar-du/rcar_lvds.c +1
-5@@ -677,15 +677,11 @@ static int rcar_lvds_attach(struct drm_bridge *bridge,if (ret <0 )return ret; -return drm_panel_attach (lvds->panel, connector); +return 0 ; }static void rcar_lvds_detach (struct drm_bridge *bridge) { -struct rcar_lvds *lvds =bridge_to_rcar_lvds (bridge); - -if (lvds->panel) -drm_panel_detach (lvds->panel); }static const struct drm_bridge_funcs rcar_lvds_bridge_ops = {drivers/gpu/drm/rockchip/rockchip_lvds.c +0
-9@@ -634,13 +634,6 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master, "failed to attach encoder: %d\n", ret); goto err_free_connector; } - - ret =drm_panel_attach (lvds->panel, connector); -if (ret <0 ) { -DRM_DEV_ERROR (drm_dev->dev, -"failed to attach panel: %d\n" , ret); - goto err_free_connector; - } }else { ret =drm_bridge_attach (encoder, lvds->bridge,NULL ,0 );if (ret) {@@ -676,8 +669,6 @@ static void rockchip_lvds_unbind(struct device *dev, struct device *master, encoder_funcs = lvds->soc_data->helper_funcs; encoder_funcs->disable (&lvds->encoder); -if (lvds->panel) -drm_panel_detach (lvds->panel);pm_runtime_disable (dev);drm_connector_cleanup (&lvds->connector);drm_encoder_cleanup (&lvds->encoder);drivers/gpu/drm/sti/sti_dvo.c +0
-2@@ -389,8 +389,6 @@ sti_dvo_connector_detect(struct drm_connector *connector, bool force) dvo->panel =of_drm_find_panel (dvo->panel_node);if (IS_ERR (dvo->panel)) dvo->panel =NULL ; -else -drm_panel_attach (dvo->panel, connector); }if (dvo->panel)drivers/gpu/drm/sun4i/sun4i_lvds.c +0
-9@@ -54,9 +54,6 @@ static struct drm_connector_helper_funcs sun4i_lvds_con_helper_funcs = {static void sun4i_lvds_connector_destroy (struct drm_connector *connector) { -struct sun4i_lvds *lvds =drm_connector_to_sun4i_lvds (connector); - -drm_panel_detach (lvds->panel);drm_connector_cleanup (connector); }@@ -141,12 +138,6 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)drm_connector_attach_encoder (&lvds->connector, &lvds->encoder); - - ret =drm_panel_attach (lvds->panel, &lvds->connector); -if (ret) { -dev_err (drm->dev,"Couldn't attach our panel\n" ); - goto err_cleanup_connector; - } }if (bridge) {drivers/gpu/drm/sun4i/sun4i_rgb.c +0
-7@@ -147,7 +147,6 @@ sun4i_rgb_connector_destroy(struct drm_connector *connector) {struct sun4i_rgb *rgb =drm_connector_to_sun4i_rgb (connector); -drm_panel_detach (rgb->panel);drm_connector_cleanup (connector); }@@ -233,12 +232,6 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon)drm_connector_attach_encoder (&rgb->connector, &rgb->encoder); - - ret =drm_panel_attach (rgb->panel, &rgb->connector); -if (ret) { -dev_err (drm->dev,"Couldn't attach our panel\n" ); - goto err_cleanup_connector; - } }if (rgb->bridge) {drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +0
-2@@ -973,7 +973,6 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, dsi->panel = panel; dsi->device = device; -drm_panel_attach (dsi->panel, &dsi->connector);drm_kms_helper_hotplug_event (dsi->drm);dev_info (host->dev,"Attached device %s\n" , device->name);@@ -990,7 +989,6 @@ static int sun6i_dsi_detach(struct mipi_dsi_host *host, dsi->panel =NULL ; dsi->device =NULL ; -drm_panel_detach (panel);drm_kms_helper_hotplug_event (dsi->drm);return 0 ;drivers/gpu/drm/tegra/dsi.c +1
-3@@ -1498,10 +1498,8 @@ static int tegra_dsi_host_attach(struct mipi_dsi_host *host,if (IS_ERR (output->panel)) output->panel =NULL ; -if (output->panel && output->connector.dev) { -drm_panel_attach (output->panel, &output->connector); +if (output->panel && output->connector.dev)drm_helper_hpd_irq_event (output->connector.dev); - } }return 0 ;drivers/gpu/drm/tegra/output.c +0
-10@@ -179,13 +179,6 @@ void tegra_output_remove(struct tegra_output *output)int tegra_output_init (struct drm_device *drm,struct tegra_output *output) {int connector_type; -int err; - -if (output->panel) { - err =drm_panel_attach (output->panel, &output->connector); -if (err <0 ) -return err; - }/* * The connector is now registered and ready to receive hotplug events @@ -220,9 +213,6 @@ void tegra_output_exit(struct tegra_output *output)*/ if (output->hpd_gpio)disable_irq (output->hpd_irq); - -if (output->panel) -drm_panel_detach (output->panel); } void tegra_output_find_possible_crtcs(struct tegra_output *output,include/drm/drm_panel.h +0
-0
include/drm/drm_panel.h void drm_panel_init(struct drm_panel *panel, struct device *dev, · line 183
Quoted 9 lines
include/drm/drm_panel.h +0
-3@@ -178,9 +178,6 @@ void drm_panel_init(struct drm_panel *panel, struct device *dev,int drm_panel_add (struct drm_panel *panel);void drm_panel_remove (struct drm_panel *panel); -int drm_panel_attach (struct drm_panel *panel,struct drm_connector *connector); -void drm_panel_detach (struct drm_panel *panel); -int drm_panel_prepare (struct drm_panel *panel);int drm_panel_unprepare (struct drm_panel *panel);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH V2] drm: Remove unnecessary drm_panel_attach and drm_panel_detach
Hi Joe.
Quoted 20 lines · Sam Ravnborg
Hi Joe.
Quoted 9 lines · Joe Perches
These functions are now empty and no longer
useful so remove the functions and their uses.Signed-off-by Joe Perches <[email protected]>---
Quoted 3 lines
Quoted 3 lines
It's too tedious to break apart into multiple patches. Done with coccinelle and typing.
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Compiled allyesconfig x86-64 only.
V2: Removed 3 additional lines
drivers/gpu/drm/omapdrm/omap_drv.c:390:27: warning: unused variable ‘priv’ [-Wunused-variable]drivers/gpu/drm/exynos/exynos_drm_dpi.c:45:21: warning: unused variable ‘ctx’ [-Wunused-variable]drivers/gpu/drm/sun4i/sun4i_lvds.c:57:21: warning: unused variable ‘lvds’ [-Wunused-variable]
Quoted 6 lines
Thanks, better now.
I had to fix a few warnings and a build error to get it going on drm-misc-next. I will keep it locally just to let anyone speak up. I you do not see any mail from me until friday that it is applied please ping me.
Thanks, Now applied to drm-misc-next. Will show up in -next sometimes after the current merge window closes.
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel