drm/panel: Initialise panel dev and funcs through drm_panel_init()

Instead of requiring all drivers to set the dev and funcs fields of
drm_panel manually after calling drm_panel_init(), pass the data as
arguments to the function. This simplifies the panel drivers, and will
help future refactoring when adding new arguments to drm_panel_init().

The panel drivers have been updated with the following Coccinelle
semantic patch, with manual inspection to verify that no call to
drm_panel_init() with a single argument still exists.

@@
expression panel;
expression device;
identifier ops;
@@
 drm_panel_init(&panel
+	, device, &ops
 );
 ...
(
-panel.dev = device;
-panel.funcs = &ops;
|
-panel.funcs = &ops;
-panel.dev = device;
)

Suggested-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190823193245.23876-3-laurent.pinchart@ideasonboard.com

diff --git a/drivers/gpu/drm/drm_panel.c b/drivers/gpu/drm/drm_panel.c
index 6b0bf42039cfa9449e6e1ad055c36e6ee08d44a1..ba2fad4c96489e8529f5f565cbbc1c2645496791 100644 (file)
--- a/drivers/gpu/drm/drm_panel.c
+++ b/drivers/gpu/drm/drm_panel.c
@@ -44,13 +44,18 @@ static LIST_HEAD(panel_list);
 /**
  * drm_panel_init - initialize a panel
  * @panel: DRM panel
+ * @dev: parent device of the panel
+ * @funcs: panel operations
  *
- * Sets up internal fields of the panel so that it can subsequently be added
- * to the registry.
+ * Initialize the panel structure for subsequent registration with
+ * drm_panel_add().
  */
-void drm_panel_init(struct drm_panel *panel)
+void drm_panel_init(struct drm_panel *panel, struct device *dev,
+                   const struct drm_panel_funcs *funcs)
 {
        INIT_LIST_HEAD(&panel->list);
+       panel->dev = dev;
+       panel->funcs = funcs;
 }
 EXPORT_SYMBOL(drm_panel_init);
 

diff --git a/drivers/gpu/drm/panel/panel-arm-versatile.c b/drivers/gpu/drm/panel/panel-arm-versatile.c
index 5f72c922a04b19f5a3dde6c0b6d4f759a56c91af..a4333ed0f20ca1d8ff4e2b5363ad5faf29cc0778 100644 (file)
--- a/drivers/gpu/drm/panel/panel-arm-versatile.c
+++ b/drivers/gpu/drm/panel/panel-arm-versatile.c
@@ -350,9 +350,7 @@ static int versatile_panel_probe(struct platform_device *pdev)
                        dev_info(dev, "panel mounted on IB2 daughterboard\n");
        }
 
-       drm_panel_init(&vpanel->panel);
-       vpanel->panel.dev = dev;
-       vpanel->panel.funcs = &versatile_panel_drm_funcs;
+       drm_panel_init(&vpanel->panel, dev, &versatile_panel_drm_funcs);
 
        return drm_panel_add(&vpanel->panel);
 }

diff --git a/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c b/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
index dabf59e0f56facafa8e1e991069ec099496ae4ea..7d5d7455bc01f5c6152902e04e1606b6124e7e8d 100644 (file)
--- a/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
+++ b/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
@@ -204,9 +204,7 @@ static int feiyang_dsi_probe(struct mipi_dsi_device *dsi)
        mipi_dsi_set_drvdata(dsi, ctx);
        ctx->dsi = dsi;
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = &dsi->dev;
-       ctx->panel.funcs = &feiyang_funcs;
+       drm_panel_init(&ctx->panel, &dsi->dev, &feiyang_funcs);
 
        ctx->dvdd = devm_regulator_get(&dsi->dev, "dvdd");
        if (IS_ERR(ctx->dvdd)) {

diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c
index 3c58f63adbf7e727851ef98f9587c9567b65fe00..ad2405baa0ac5acf0e7b9b6784c84cc33782b35b 100644 (file)
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c
@@ -895,9 +895,7 @@ static int ili9322_probe(struct spi_device *spi)
                ili->input = ili->conf->input;
        }
 
-       drm_panel_init(&ili->panel);
-       ili->panel.dev = dev;
-       ili->panel.funcs = &ili9322_drm_funcs;
+       drm_panel_init(&ili->panel, dev, &ili9322_drm_funcs);
 
        return drm_panel_add(&ili->panel);
 }

diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
index 3ad4a46c4e945d2b49785c8d7298cb1d7d26bb30..1d714f961c00937b289ae73e20e53c05ecd0ebde 100644 (file)
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
@@ -433,9 +433,7 @@ static int ili9881c_dsi_probe(struct mipi_dsi_device *dsi)
        mipi_dsi_set_drvdata(dsi, ctx);
        ctx->dsi = dsi;
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = &dsi->dev;
-       ctx->panel.funcs = &ili9881c_funcs;
+       drm_panel_init(&ctx->panel, &dsi->dev, &ili9881c_funcs);
 
        ctx->power = devm_regulator_get(&dsi->dev, "power");
        if (IS_ERR(ctx->power)) {

diff --git a/drivers/gpu/drm/panel/panel-innolux-p079zca.c b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
index d92d1c98878c12f8bffecfd0d955d84140033ac1..2054afc31f207ddd12fa2bee83b1c2c94cfbf674 100644 (file)
--- a/drivers/gpu/drm/panel/panel-innolux-p079zca.c
+++ b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
@@ -487,9 +487,7 @@ static int innolux_panel_add(struct mipi_dsi_device *dsi,
        if (IS_ERR(innolux->backlight))
                return PTR_ERR(innolux->backlight);
 
-       drm_panel_init(&innolux->base);
-       innolux->base.funcs = &innolux_panel_funcs;
-       innolux->base.dev = dev;
+       drm_panel_init(&innolux->base, dev, &innolux_panel_funcs);
 
        err = drm_panel_add(&innolux->base);
        if (err < 0)

diff --git a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
index ff3e89e61e3fc44c101b52dfbf8512b785e422d2..7bfdbfbc868edf36aa4ababb6bb549dadb18d8b3 100644 (file)
--- a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
+++ b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
@@ -437,9 +437,7 @@ static int jdi_panel_add(struct jdi_panel *jdi)
                return ret;
        }
 
-       drm_panel_init(&jdi->base);
-       jdi->base.funcs = &jdi_panel_funcs;
-       jdi->base.dev = &jdi->dsi->dev;
+       drm_panel_init(&jdi->base, &jdi->dsi->dev, &jdi_panel_funcs);
 
        ret = drm_panel_add(&jdi->base);
 

diff --git a/drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c b/drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c
index 3ac04eb8d0fe59c1a2f44362bf2497b2c09c5116..a47885a1a8aa8f6665c0fbb6f3ab41cb8aeba15d 100644 (file)
--- a/drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c
+++ b/drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c
@@ -391,9 +391,8 @@ static int kingdisplay_panel_add(struct kingdisplay_panel *kingdisplay)
        if (IS_ERR(kingdisplay->backlight))
                return PTR_ERR(kingdisplay->backlight);
 
-       drm_panel_init(&kingdisplay->base);
-       kingdisplay->base.funcs = &kingdisplay_panel_funcs;
-       kingdisplay->base.dev = &kingdisplay->link->dev;
+       drm_panel_init(&kingdisplay->base, &kingdisplay->link->dev,
+                      &kingdisplay_panel_funcs);
 
        return drm_panel_add(&kingdisplay->base);
 }

diff --git a/drivers/gpu/drm/panel/panel-lg-lb035q02.c b/drivers/gpu/drm/panel/panel-lg-lb035q02.c
index fc82a525b071bc3bc9f8e9ac0d3cedbca849bb3d..28c3205df482ba248996818bc3438a50fa05d84b 100644 (file)
--- a/drivers/gpu/drm/panel/panel-lg-lb035q02.c
+++ b/drivers/gpu/drm/panel/panel-lg-lb035q02.c
@@ -196,9 +196,7 @@ static int lb035q02_probe(struct spi_device *spi)
        if (ret < 0)
                return ret;
 
-       drm_panel_init(&lcd->panel);
-       lcd->panel.dev = &lcd->spi->dev;
-       lcd->panel.funcs = &lb035q02_funcs;
+       drm_panel_init(&lcd->panel, &lcd->spi->dev, &lb035q02_funcs);
 
        return drm_panel_add(&lcd->panel);
 }

diff --git a/drivers/gpu/drm/panel/panel-lg-lg4573.c b/drivers/gpu/drm/panel/panel-lg-lg4573.c
index 41bf02d122a1f581e2cc6c3431a0e13d4529eed4..608f2de91662dba35b61bae01ed50ce9d2c3b951 100644 (file)
--- a/drivers/gpu/drm/panel/panel-lg-lg4573.c
+++ b/drivers/gpu/drm/panel/panel-lg-lg4573.c
@@ -259,9 +259,7 @@ static int lg4573_probe(struct spi_device *spi)
                return ret;
        }
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = &spi->dev;
-       ctx->panel.funcs = &lg4573_drm_funcs;
+       drm_panel_init(&ctx->panel, &spi->dev, &lg4573_drm_funcs);
 
        return drm_panel_add(&ctx->panel);
 }

diff --git a/drivers/gpu/drm/panel/panel-lvds.c b/drivers/gpu/drm/panel/panel-lvds.c
index ad47cc95459ebb1b248f8c33bdcac1a7189cd1d0..3dc1ac2a6b03b2645f0e08e91a859a3e64723b43 100644 (file)
--- a/drivers/gpu/drm/panel/panel-lvds.c
+++ b/drivers/gpu/drm/panel/panel-lvds.c
@@ -260,9 +260,7 @@ static int panel_lvds_probe(struct platform_device *pdev)
         */
 
        /* Register the panel. */
-       drm_panel_init(&lvds->panel);
-       lvds->panel.dev = lvds->dev;
-       lvds->panel.funcs = &panel_lvds_funcs;
+       drm_panel_init(&lvds->panel, lvds->dev, &panel_lvds_funcs);
 
        ret = drm_panel_add(&lvds->panel);
        if (ret < 0)

diff --git a/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c b/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c
index 299b217c83e186493e20466b5ebfae0f6caa916f..b67636fdbc216303884b722d22b1e069c5d28b86 100644 (file)
--- a/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c
+++ b/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c
@@ -205,9 +205,7 @@ static int nl8048_probe(struct spi_device *spi)
        if (ret < 0)
                return ret;
 
-       drm_panel_init(&lcd->panel);
-       lcd->panel.dev = &lcd->spi->dev;
-       lcd->panel.funcs = &nl8048_funcs;
+       drm_panel_init(&lcd->panel, &lcd->spi->dev, &nl8048_funcs);
 
        return drm_panel_add(&lcd->panel);
 }

diff --git a/drivers/gpu/drm/panel/panel-novatek-nt39016.c b/drivers/gpu/drm/panel/panel-novatek-nt39016.c
index 2ad1063b068d549c952b8af18190434b72ad00e6..64cfe111aaadb0d1aa47677da42c82c534bd5c1f 100644 (file)
--- a/drivers/gpu/drm/panel/panel-novatek-nt39016.c
+++ b/drivers/gpu/drm/panel/panel-novatek-nt39016.c
@@ -292,9 +292,7 @@ static int nt39016_probe(struct spi_device *spi)
                return err;
        }
 
-       drm_panel_init(&panel->drm_panel);
-       panel->drm_panel.dev = dev;
-       panel->drm_panel.funcs = &nt39016_funcs;
+       drm_panel_init(&panel->drm_panel, dev, &nt39016_funcs);
 
        err = drm_panel_add(&panel->drm_panel);
        if (err < 0) {

diff --git a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
index 2bae1db3ff344ba491be710edf0681d73090b531..f2d6a4ec00467635b26fb152f65759b93efcd947 100644 (file)
--- a/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
+++ b/drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
@@ -288,9 +288,7 @@ static int lcd_olinuxino_probe(struct i2c_client *client,
        if (IS_ERR(lcd->backlight))
                return PTR_ERR(lcd->backlight);
 
-       drm_panel_init(&lcd->panel);
-       lcd->panel.dev = dev;
-       lcd->panel.funcs = &lcd_olinuxino_funcs;
+       drm_panel_init(&lcd->panel, dev, &lcd_olinuxino_funcs);
 
        return drm_panel_add(&lcd->panel);
 }

diff --git a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
index c7b48df8869a1d6e28a9e174076af0f709525934..8b60d5e4d7756d2375aed69c153c07b9346490c3 100644 (file)
--- a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
+++ b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
@@ -455,9 +455,7 @@ static int otm8009a_probe(struct mipi_dsi_device *dsi)
        dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
                          MIPI_DSI_MODE_LPM;
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = dev;
-       ctx->panel.funcs = &otm8009a_drm_funcs;
+       drm_panel_init(&ctx->panel, dev, &otm8009a_drm_funcs);
 
        ctx->bl_dev = devm_backlight_device_register(dev, dev_name(dev),
                                                     dsi->host->dev, ctx,

diff --git a/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c b/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
index e0e20ecff916db58f3e86a18f440fb75f74e1dd1..38f114b03b89769ba884d626f83744300f4c75e3 100644 (file)
--- a/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
+++ b/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
@@ -166,9 +166,8 @@ static int osd101t2587_panel_add(struct osd101t2587_panel *osd101t2587)
        if (IS_ERR(osd101t2587->backlight))
                return PTR_ERR(osd101t2587->backlight);
 
-       drm_panel_init(&osd101t2587->base);
-       osd101t2587->base.funcs = &osd101t2587_panel_funcs;
-       osd101t2587->base.dev = &osd101t2587->dsi->dev;
+       drm_panel_init(&osd101t2587->base, &osd101t2587->dsi->dev,
+                      &osd101t2587_panel_funcs);
 
        return drm_panel_add(&osd101t2587->base);
 }

diff --git a/drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c b/drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c
index 3dff0b3f73c233311ab5606ab73c63f5620eed3d..6035bf45807443c1780406fa8fe8b50d1967e676 100644 (file)
--- a/drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c
+++ b/drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c
@@ -223,9 +223,8 @@ static int wuxga_nt_panel_add(struct wuxga_nt_panel *wuxga_nt)
                        return -EPROBE_DEFER;
        }
 
-       drm_panel_init(&wuxga_nt->base);
-       wuxga_nt->base.funcs = &wuxga_nt_panel_funcs;
-       wuxga_nt->base.dev = &wuxga_nt->dsi->dev;
+       drm_panel_init(&wuxga_nt->base, &wuxga_nt->dsi->dev,
+                      &wuxga_nt_panel_funcs);
 
        ret = drm_panel_add(&wuxga_nt->base);
        if (ret < 0)

diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
index 2aa89eaecf6ff2bee9526615124841ea170431cb..23a801427e423b497334c47323b0217186b9cd03 100644 (file)
--- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
+++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
@@ -426,9 +426,7 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c,
                return PTR_ERR(ts->dsi);
        }
 
-       drm_panel_init(&ts->base);
-       ts->base.dev = dev;
-       ts->base.funcs = &rpi_touchscreen_funcs;
+       drm_panel_init(&ts->base, dev, &rpi_touchscreen_funcs);
 
        /* This appears last, as it's what will unblock the DSI host
         * driver's component bind function.

diff --git a/drivers/gpu/drm/panel/panel-raydium-rm67191.c b/drivers/gpu/drm/panel/panel-raydium-rm67191.c
index 6a5d37006103e53ed12273ed2f49665a913266df..f82a1f69f13ba1433f58eb527332525c882d698d 100644 (file)
--- a/drivers/gpu/drm/panel/panel-raydium-rm67191.c
+++ b/drivers/gpu/drm/panel/panel-raydium-rm67191.c
@@ -606,9 +606,7 @@ static int rad_panel_probe(struct mipi_dsi_device *dsi)
        if (ret)
                return ret;
 
-       drm_panel_init(&panel->panel);
-       panel->panel.funcs = &rad_panel_funcs;
-       panel->panel.dev = dev;
+       drm_panel_init(&panel->panel, dev, &rad_panel_funcs);
        dev_set_drvdata(dev, panel);
 
        ret = drm_panel_add(&panel->panel);

diff --git a/drivers/gpu/drm/panel/panel-raydium-rm68200.c b/drivers/gpu/drm/panel/panel-raydium-rm68200.c
index ba889625ad4353f1dd6b18fa15b6fde159bc0c93..f004b78fb8bc9d37c05bb9108148413f0327594a 100644 (file)
--- a/drivers/gpu/drm/panel/panel-raydium-rm68200.c
+++ b/drivers/gpu/drm/panel/panel-raydium-rm68200.c
@@ -404,9 +404,7 @@ static int rm68200_probe(struct mipi_dsi_device *dsi)
        dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
                          MIPI_DSI_MODE_LPM;
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = dev;
-       ctx->panel.funcs = &rm68200_drm_funcs;
+       drm_panel_init(&ctx->panel, dev, &rm68200_drm_funcs);
 
        drm_panel_add(&ctx->panel);
 

diff --git a/drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c b/drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
index b9109922397ff6e2a9fdf479f4600ff3696be1cf..d7f56374f2f1728c077928cb0d48f5bcb3663891 100644 (file)
--- a/drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
+++ b/drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
@@ -343,9 +343,7 @@ static int jh057n_probe(struct mipi_dsi_device *dsi)
                return ret;
        }
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = dev;
-       ctx->panel.funcs = &jh057n_drm_funcs;
+       drm_panel_init(&ctx->panel, dev, &jh057n_drm_funcs);
 
        drm_panel_add(&ctx->panel);
 

diff --git a/drivers/gpu/drm/panel/panel-ronbo-rb070d30.c b/drivers/gpu/drm/panel/panel-ronbo-rb070d30.c
index 3c15764f0c039c8261820a881e66a817ab94d71d..8708fbbe763766cf0f0f1efafcecd07b19f4c589 100644 (file)
--- a/drivers/gpu/drm/panel/panel-ronbo-rb070d30.c
+++ b/drivers/gpu/drm/panel/panel-ronbo-rb070d30.c
@@ -173,9 +173,7 @@ static int rb070d30_panel_dsi_probe(struct mipi_dsi_device *dsi)
        mipi_dsi_set_drvdata(dsi, ctx);
        ctx->dsi = dsi;
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = &dsi->dev;
-       ctx->panel.funcs = &rb070d30_panel_funcs;
+       drm_panel_init(&ctx->panel, &dsi->dev, &rb070d30_panel_funcs);
 
        ctx->gpios.reset = devm_gpiod_get(&dsi->dev, "reset", GPIOD_OUT_LOW);
        if (IS_ERR(ctx->gpios.reset)) {

diff --git a/drivers/gpu/drm/panel/panel-samsung-ld9040.c b/drivers/gpu/drm/panel/panel-samsung-ld9040.c
index 3be902dcedc02254788c2060cf3c2515a5c2ee87..71a292dbec4781901a95def4ae509883014143e2 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-ld9040.c
+++ b/drivers/gpu/drm/panel/panel-samsung-ld9040.c
@@ -351,9 +351,7 @@ static int ld9040_probe(struct spi_device *spi)
                return ret;
        }
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = dev;
-       ctx->panel.funcs = &ld9040_drm_funcs;
+       drm_panel_init(&ctx->panel, dev, &ld9040_drm_funcs);
 
        return drm_panel_add(&ctx->panel);
 }

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c b/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
index f75bef24e0504664c96b9c0d2534b94554baad4d..4d25c96e842cf09e96a5674951514f1bdb89927b 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
@@ -215,9 +215,7 @@ static int s6d16d0_probe(struct mipi_dsi_device *dsi)
                return ret;
        }
 
-       drm_panel_init(&s6->panel);
-       s6->panel.dev = dev;
-       s6->panel.funcs = &s6d16d0_drm_funcs;
+       drm_panel_init(&s6->panel, dev, &s6d16d0_drm_funcs);
 
        ret = drm_panel_add(&s6->panel);
        if (ret < 0)

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c b/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
index b923de23ed654fe7c6ce9d09fd96557f7366836b..42a3aaab49eb412876ee135a3aa03556ba34aec4 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
@@ -732,9 +732,7 @@ static int s6e3ha2_probe(struct mipi_dsi_device *dsi)
        ctx->bl_dev->props.brightness = S6E3HA2_DEFAULT_BRIGHTNESS;
        ctx->bl_dev->props.power = FB_BLANK_POWERDOWN;
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = dev;
-       ctx->panel.funcs = &s6e3ha2_drm_funcs;
+       drm_panel_init(&ctx->panel, dev, &s6e3ha2_drm_funcs);
 
        ret = drm_panel_add(&ctx->panel);
        if (ret < 0)

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c b/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
index cd90fa700c49331e7201cb1c8042d48599a75d6f..b4d879bf4d03d06d12a295542bd7a4d8c0631a59 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
@@ -466,9 +466,7 @@ static int s6e63j0x03_probe(struct mipi_dsi_device *dsi)
                return PTR_ERR(ctx->reset_gpio);
        }
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = dev;
-       ctx->panel.funcs = &s6e63j0x03_funcs;
+       drm_panel_init(&ctx->panel, dev, &s6e63j0x03_funcs);
 
        ctx->bl_dev = backlight_device_register("s6e63j0x03", dev, ctx,
                                                &s6e63j0x03_bl_ops, NULL);

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e63m0.c b/drivers/gpu/drm/panel/panel-samsung-s6e63m0.c
index 142d395ea51295c40a1e4b77087894e84c92e822..61259c2833ab84536ab1642d18e2648c5e3622db 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-s6e63m0.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e63m0.c
@@ -473,9 +473,7 @@ static int s6e63m0_probe(struct spi_device *spi)
                return ret;
        }
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = dev;
-       ctx->panel.funcs = &s6e63m0_drm_funcs;
+       drm_panel_init(&ctx->panel, dev, &s6e63m0_drm_funcs);
 
        ret = s6e63m0_backlight_register(ctx);
        if (ret < 0)

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c b/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
index 81858267723ad0ce5888ebb90f7f50958ebe03c5..35dbffabd52672e9b855e06fb2685935be903f8c 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
@@ -1017,9 +1017,7 @@ static int s6e8aa0_probe(struct mipi_dsi_device *dsi)
 
        ctx->brightness = GAMMA_LEVEL_NUM - 1;
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = dev;
-       ctx->panel.funcs = &s6e8aa0_drm_funcs;
+       drm_panel_init(&ctx->panel, dev, &s6e8aa0_drm_funcs);
 
        ret = drm_panel_add(&ctx->panel);
        if (ret < 0)

diff --git a/drivers/gpu/drm/panel/panel-seiko-43wvf1g.c b/drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
index 18b22b1294fbc582f47483029022f71df2078c5f..0833d0c03adc9ef7e88f01c8e91a08899b85b0a1 100644 (file)
--- a/drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
+++ b/drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
@@ -274,9 +274,7 @@ static int seiko_panel_probe(struct device *dev,
                        return -EPROBE_DEFER;
        }
 
-       drm_panel_init(&panel->base);
-       panel->base.dev = dev;
-       panel->base.funcs = &seiko_panel_funcs;
+       drm_panel_init(&panel->base, dev, &seiko_panel_funcs);
 
        err = drm_panel_add(&panel->base);
        if (err < 0)

diff --git a/drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c b/drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c
index e910b4ad13104cc00f086fdeed0e7aeb8a99d88d..87a58cb4d94554abf6b7539ef7f145d68bff719d 100644 (file)
--- a/drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c
+++ b/drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c
@@ -329,9 +329,7 @@ static int sharp_panel_add(struct sharp_panel *sharp)
        if (IS_ERR(sharp->backlight))
                return PTR_ERR(sharp->backlight);
 
-       drm_panel_init(&sharp->base);
-       sharp->base.funcs = &sharp_panel_funcs;
-       sharp->base.dev = &sharp->link1->dev;
+       drm_panel_init(&sharp->base, &sharp->link1->dev, &sharp_panel_funcs);
 
        return drm_panel_add(&sharp->base);
 }

diff --git a/drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c b/drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c
index 46cd9a2501298222edaf9dac935e7c9e6a6aed1d..96e3deb0e305c8c41b53eae1173fe6df9ebb9159 100644 (file)
--- a/drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c
+++ b/drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c
@@ -185,9 +185,7 @@ static int ls037v7dw01_probe(struct platform_device *pdev)
                return PTR_ERR(lcd->ud_gpio);
        }
 
-       drm_panel_init(&lcd->panel);
-       lcd->panel.dev = &pdev->dev;
-       lcd->panel.funcs = &ls037v7dw01_funcs;
+       drm_panel_init(&lcd->panel, &pdev->dev, &ls037v7dw01_funcs);
 
        return drm_panel_add(&lcd->panel);
 }

diff --git a/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c b/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c
index c39abde9f9f10cae1df13b33a1c84a339408c128..ffa844ee82ad4b3c52efc08b0e9a605fdb303c26 100644 (file)
--- a/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c
+++ b/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c
@@ -264,9 +264,8 @@ static int sharp_nt_panel_add(struct sharp_nt_panel *sharp_nt)
        if (IS_ERR(sharp_nt->backlight))
                return PTR_ERR(sharp_nt->backlight);
 
-       drm_panel_init(&sharp_nt->base);
-       sharp_nt->base.funcs = &sharp_nt_panel_funcs;
-       sharp_nt->base.dev = &sharp_nt->dsi->dev;
+       drm_panel_init(&sharp_nt->base, &sharp_nt->dsi->dev,
+                      &sharp_nt_panel_funcs);
 
        return drm_panel_add(&sharp_nt->base);
 }

diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
index 28fa6ba7b767394d2fd918079f164fca08941ff8..b36c130d5cf059c496edd88d37de54d274ee7ada 100644 (file)
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -464,9 +464,7 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc)
        if (!of_get_display_timing(dev->of_node, "panel-timing", &dt))
                panel_simple_parse_panel_timing_node(dev, panel, &dt);
 
-       drm_panel_init(&panel->base);
-       panel->base.dev = dev;
-       panel->base.funcs = &panel_simple_funcs;
+       drm_panel_init(&panel->base, dev, &panel_simple_funcs);
 
        err = drm_panel_add(&panel->base);
        if (err < 0)

diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7701.c b/drivers/gpu/drm/panel/panel-sitronix-st7701.c
index 09c5d9a6f9fa8a169e5e16f54b68fb757eeecf8c..3f7bcd24aa815546133f17ed6707838b62e579c5 100644 (file)
--- a/drivers/gpu/drm/panel/panel-sitronix-st7701.c
+++ b/drivers/gpu/drm/panel/panel-sitronix-st7701.c
@@ -369,7 +369,7 @@ static int st7701_dsi_probe(struct mipi_dsi_device *dsi)
        if (IS_ERR(st7701->backlight))
                return PTR_ERR(st7701->backlight);
 
-       drm_panel_init(&st7701->panel);
+       drm_panel_init(&st7701->panel, &dsi->dev, &st7701_funcs);
 
        /**
         * Once sleep out has been issued, ST7701 IC required to wait 120ms
@@ -381,8 +381,6 @@ static int st7701_dsi_probe(struct mipi_dsi_device *dsi)
         * ts8550b and there is no valid documentation for that.
         */
        st7701->sleep_delay = 120 + desc->panel_sleep_delay;
-       st7701->panel.funcs = &st7701_funcs;
-       st7701->panel.dev = &dsi->dev;
 
        ret = drm_panel_add(&st7701->panel);
        if (ret < 0)

diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7789v.c b/drivers/gpu/drm/panel/panel-sitronix-st7789v.c
index 3b2612ae931e828511d3d201635f77c5f29e29aa..2eeaeee0dd7f39907c27017f6a61e8eb87062e16 100644 (file)
--- a/drivers/gpu/drm/panel/panel-sitronix-st7789v.c
+++ b/drivers/gpu/drm/panel/panel-sitronix-st7789v.c
@@ -381,9 +381,7 @@ static int st7789v_probe(struct spi_device *spi)
        spi_set_drvdata(spi, ctx);
        ctx->spi = spi;
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = &spi->dev;
-       ctx->panel.funcs = &st7789v_drm_funcs;
+       drm_panel_init(&ctx->panel, &spi->dev, &st7789v_drm_funcs);
 
        ctx->power = devm_regulator_get(&spi->dev, "power");
        if (IS_ERR(ctx->power))

diff --git a/drivers/gpu/drm/panel/panel-sony-acx565akm.c b/drivers/gpu/drm/panel/panel-sony-acx565akm.c
index 305259b5876701dc9db0aab4e472e16306ec3a02..5a2772b04b758ea8db2c8491c701e79d9e0e12cf 100644 (file)
--- a/drivers/gpu/drm/panel/panel-sony-acx565akm.c
+++ b/drivers/gpu/drm/panel/panel-sony-acx565akm.c
@@ -648,9 +648,7 @@ static int acx565akm_probe(struct spi_device *spi)
                        return ret;
        }
 
-       drm_panel_init(&lcd->panel);
-       lcd->panel.dev = &lcd->spi->dev;
-       lcd->panel.funcs = &acx565akm_funcs;
+       drm_panel_init(&lcd->panel, &lcd->spi->dev, &acx565akm_funcs);
 
        ret = drm_panel_add(&lcd->panel);
        if (ret < 0) {

diff --git a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c
index d7b2e34626efe81435a632711fb8b5dc2e1b3d01..8b1148d74e7bdfcddcdf69cd43f98664a2d823c8 100644 (file)
--- a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c
+++ b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c
@@ -347,9 +347,7 @@ static int td028ttec1_probe(struct spi_device *spi)
                return ret;
        }
 
-       drm_panel_init(&lcd->panel);
-       lcd->panel.dev = &lcd->spi->dev;
-       lcd->panel.funcs = &td028ttec1_funcs;
+       drm_panel_init(&lcd->panel, &lcd->spi->dev, &td028ttec1_funcs);
 
        return drm_panel_add(&lcd->panel);
 }

diff --git a/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c b/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c
index 84370562910ff5dfcd52dd1896d227464db2d9bb..bbf0c2e1c90fe3a59687817bbb5615fbeb728f62 100644 (file)
--- a/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c
+++ b/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c
@@ -458,9 +458,7 @@ static int td043mtea1_probe(struct spi_device *spi)
                return ret;
        }
 
-       drm_panel_init(&lcd->panel);
-       lcd->panel.dev = &lcd->spi->dev;
-       lcd->panel.funcs = &td043mtea1_funcs;
+       drm_panel_init(&lcd->panel, &lcd->spi->dev, &td043mtea1_funcs);
 
        ret = drm_panel_add(&lcd->panel);
        if (ret < 0) {

diff --git a/drivers/gpu/drm/panel/panel-tpo-tpg110.c b/drivers/gpu/drm/panel/panel-tpo-tpg110.c
index 71591e5f59383f9c1ae9e3bddec78c2f234314bc..25524c26b241b6438903feabb9058dc25c7bc145 100644 (file)
--- a/drivers/gpu/drm/panel/panel-tpo-tpg110.c
+++ b/drivers/gpu/drm/panel/panel-tpo-tpg110.c
@@ -457,9 +457,7 @@ static int tpg110_probe(struct spi_device *spi)
        if (ret)
                return ret;
 
-       drm_panel_init(&tpg->panel);
-       tpg->panel.dev = dev;
-       tpg->panel.funcs = &tpg110_drm_funcs;
+       drm_panel_init(&tpg->panel, dev, &tpg110_drm_funcs);
        spi_set_drvdata(spi, tpg);
 
        return drm_panel_add(&tpg->panel);

diff --git a/drivers/gpu/drm/panel/panel-truly-nt35597.c b/drivers/gpu/drm/panel/panel-truly-nt35597.c
index 77e1311b7c6921a51596c982a28c870895a34976..c3714be788375dde570967aa82b2f4f28c892b66 100644 (file)
--- a/drivers/gpu/drm/panel/panel-truly-nt35597.c
+++ b/drivers/gpu/drm/panel/panel-truly-nt35597.c
@@ -518,9 +518,7 @@ static int truly_nt35597_panel_add(struct truly_nt35597 *ctx)
        /* dual port */
        gpiod_set_value(ctx->mode_gpio, 0);
 
-       drm_panel_init(&ctx->panel);
-       ctx->panel.dev = dev;
-       ctx->panel.funcs = &truly_nt35597_drm_funcs;
+       drm_panel_init(&ctx->panel, dev, &truly_nt35597_drm_funcs);
        drm_panel_add(&ctx->panel);
 
        return 0;

diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h
index 624bd15ecfab61869a9132a10bf208d516084838..4b9c656dc15e305326cc924ca986503d873cf414 100644 (file)
--- a/include/drm/drm_panel.h
+++ b/include/drm/drm_panel.h
@@ -147,7 +147,8 @@ struct drm_panel {
        struct list_head list;
 };
 
-void drm_panel_init(struct drm_panel *panel);
+void drm_panel_init(struct drm_panel *panel, struct device *dev,
+                   const struct drm_panel_funcs *funcs);
 
 int drm_panel_add(struct drm_panel *panel);
 void drm_panel_remove(struct drm_panel *panel);