drm/mipi-dsi: Make remove callback return void

All implementations return 0 and the return value of mipi_dsi_drv_remove()
is ignored anyhow.

So change the prototype of the remove function to return no value. This
way driver authors are not tempted to assume that passing an error to
the upper layer is a good idea. All drivers are adapted accordingly.
There is no intended change of behaviour.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220708094922.1408248-4-u.kleine-koenig@pengutronix.de

diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bridge/chipone-icn6211.c
index 481c86b2406e8b8f8a9de793c86825e1e40d9329..b07d2d16c3cfc3f9397b9d71ccbb7330cd97464e 100644 (file)
--- a/drivers/gpu/drm/bridge/chipone-icn6211.c
+++ b/drivers/gpu/drm/bridge/chipone-icn6211.c
@@ -735,14 +735,12 @@ static int chipone_i2c_probe(struct i2c_client *client,
        return chipone_dsi_host_attach(icn);
 }
 
-static int chipone_dsi_remove(struct mipi_dsi_device *dsi)
+static void chipone_dsi_remove(struct mipi_dsi_device *dsi)
 {
        struct chipone *icn = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_bridge_remove(&icn->bridge);
-
-       return 0;
 }
 
 static const struct of_device_id chipone_of_match[] = {

diff --git a/drivers/gpu/drm/bridge/tc358762.c b/drivers/gpu/drm/bridge/tc358762.c
index 40439da4db49797646d4c8227b38718f62c80cc5..7f4fce1aa998886100918c04190afa775797fab2 100644 (file)
--- a/drivers/gpu/drm/bridge/tc358762.c
+++ b/drivers/gpu/drm/bridge/tc358762.c
@@ -241,14 +241,12 @@ static int tc358762_probe(struct mipi_dsi_device *dsi)
        return ret;
 }
 
-static int tc358762_remove(struct mipi_dsi_device *dsi)
+static void tc358762_remove(struct mipi_dsi_device *dsi)
 {
        struct tc358762 *ctx = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_bridge_remove(&ctx->bridge);
-
-       return 0;
 }
 
 static const struct of_device_id tc358762_of_match[] = {

diff --git a/drivers/gpu/drm/bridge/tc358764.c b/drivers/gpu/drm/bridge/tc358764.c
index fdfb14aca926f0c65742e22475d356c1f19131e9..53259c12d7778bd08cc39b3638aebe044cc292c5 100644 (file)
--- a/drivers/gpu/drm/bridge/tc358764.c
+++ b/drivers/gpu/drm/bridge/tc358764.c
@@ -381,14 +381,12 @@ static int tc358764_probe(struct mipi_dsi_device *dsi)
        return ret;
 }
 
-static int tc358764_remove(struct mipi_dsi_device *dsi)
+static void tc358764_remove(struct mipi_dsi_device *dsi)
 {
        struct tc358764 *ctx = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_bridge_remove(&ctx->bridge);
-
-       return 0;
 }
 
 static const struct of_device_id tc358764_of_match[] = {

diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c
index c40bde96cfdf05dfa8d6d39a74a738854867c0c5..2e25804d6ffa141222fc923f178e6cc13f839716 100644 (file)
--- a/drivers/gpu/drm/drm_mipi_dsi.c
+++ b/drivers/gpu/drm/drm_mipi_dsi.c
@@ -1236,7 +1236,9 @@ static int mipi_dsi_drv_remove(struct device *dev)
        struct mipi_dsi_driver *drv = to_mipi_dsi_driver(dev->driver);
        struct mipi_dsi_device *dsi = to_mipi_dsi_device(dev);
 
-       return drv->remove(dsi);
+       drv->remove(dsi);
+
+       return 0;
 }
 
 static void mipi_dsi_drv_shutdown(struct device *dev)

diff --git a/drivers/gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c b/drivers/gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c
index 174ff434bd71e0a7cbb0134ac84e192f9106f030..b3235781e6ba19d9af0aef8277f7cbdf51940e82 100644 (file)
--- a/drivers/gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c
+++ b/drivers/gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c
@@ -321,7 +321,7 @@ static int tm5p5_nt35596_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int tm5p5_nt35596_remove(struct mipi_dsi_device *dsi)
+static void tm5p5_nt35596_remove(struct mipi_dsi_device *dsi)
 {
        struct tm5p5_nt35596 *ctx = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -332,8 +332,6 @@ static int tm5p5_nt35596_remove(struct mipi_dsi_device *dsi)
                        "Failed to detach from DSI host: %d\n", ret);
 
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id tm5p5_nt35596_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c b/drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c
index ef00cd67dc407a80d19c1cab3008cb2f4eb74032..ad58840eda41868781717e111f2d31dbaef7640d 100644 (file)
--- a/drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c
+++ b/drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c
@@ -410,7 +410,7 @@ static int boe_bf060y8m_aj0_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int boe_bf060y8m_aj0_remove(struct mipi_dsi_device *dsi)
+static void boe_bf060y8m_aj0_remove(struct mipi_dsi_device *dsi)
 {
        struct boe_bf060y8m_aj0 *boe = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -420,8 +420,6 @@ static int boe_bf060y8m_aj0_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret);
 
        drm_panel_remove(&boe->panel);
-
-       return 0;
 }
 
 static const struct of_device_id boe_bf060y8m_aj0_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-boe-himax8279d.c b/drivers/gpu/drm/panel/panel-boe-himax8279d.c
index 42854bd37fd5b569fab8b6703f584775b3ff37c1..d879b3b14c484922019ead73f15b8df299a46e21 100644 (file)
--- a/drivers/gpu/drm/panel/panel-boe-himax8279d.c
+++ b/drivers/gpu/drm/panel/panel-boe-himax8279d.c
@@ -919,7 +919,7 @@ static int panel_probe(struct mipi_dsi_device *dsi)
        return err;
 }
 
-static int panel_remove(struct mipi_dsi_device *dsi)
+static void panel_remove(struct mipi_dsi_device *dsi)
 {
        struct panel_info *pinfo = mipi_dsi_get_drvdata(dsi);
        int err;
@@ -937,8 +937,6 @@ static int panel_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", err);
 
        drm_panel_remove(&pinfo->base);
-
-       return 0;
 }
 
 static void panel_shutdown(struct mipi_dsi_device *dsi)

diff --git a/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c b/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
index 07f722f33fc5bbc7d16a5e6fc8abbb80831a9409..857a2f0420d778731006b3b92754293de6726c7c 100644 (file)
--- a/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
+++ b/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
@@ -1622,7 +1622,7 @@ static void boe_panel_shutdown(struct mipi_dsi_device *dsi)
        drm_panel_unprepare(&boe->base);
 }
 
-static int boe_panel_remove(struct mipi_dsi_device *dsi)
+static void boe_panel_remove(struct mipi_dsi_device *dsi)
 {
        struct boe_panel *boe = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -1635,8 +1635,6 @@ static int boe_panel_remove(struct mipi_dsi_device *dsi)
 
        if (boe->base.dev)
                drm_panel_remove(&boe->base);
-
-       return 0;
 }
 
 static const struct of_device_id boe_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-dsi-cm.c b/drivers/gpu/drm/panel/panel-dsi-cm.c
index b0213a518f9d88198c3b518daf8faec8d4152620..ba17bcc4461c76472acce1abfe8b4a429bd2f03d 100644 (file)
--- a/drivers/gpu/drm/panel/panel-dsi-cm.c
+++ b/drivers/gpu/drm/panel/panel-dsi-cm.c
@@ -579,7 +579,7 @@ err_bl:
        return r;
 }
 
-static int dsicm_remove(struct mipi_dsi_device *dsi)
+static void dsicm_remove(struct mipi_dsi_device *dsi)
 {
        struct panel_drv_data *ddata = mipi_dsi_get_drvdata(dsi);
 
@@ -593,8 +593,6 @@ static int dsicm_remove(struct mipi_dsi_device *dsi)
 
        if (ddata->extbldev)
                put_device(&ddata->extbldev->dev);
-
-       return 0;
 }
 
 static const struct dsic_panel_data taal_data = {

diff --git a/drivers/gpu/drm/panel/panel-ebbg-ft8719.c b/drivers/gpu/drm/panel/panel-ebbg-ft8719.c
index 386f8321b930e5b95e16c74305aae9eac8564e25..e85d63a176d04274177cf3c830a64fac6439e9fa 100644 (file)
--- a/drivers/gpu/drm/panel/panel-ebbg-ft8719.c
+++ b/drivers/gpu/drm/panel/panel-ebbg-ft8719.c
@@ -250,7 +250,7 @@ static int ebbg_ft8719_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int ebbg_ft8719_remove(struct mipi_dsi_device *dsi)
+static void ebbg_ft8719_remove(struct mipi_dsi_device *dsi)
 {
        struct ebbg_ft8719 *ctx = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -260,8 +260,6 @@ static int ebbg_ft8719_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret);
 
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id ebbg_ft8719_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-elida-kd35t133.c b/drivers/gpu/drm/panel/panel-elida-kd35t133.c
index 01dd555a7f26aa758e9d0b23f1d86039573c7f8e..eee714cf3f4906431c21503afbf669051cdbbd7d 100644 (file)
--- a/drivers/gpu/drm/panel/panel-elida-kd35t133.c
+++ b/drivers/gpu/drm/panel/panel-elida-kd35t133.c
@@ -321,7 +321,7 @@ static void kd35t133_shutdown(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret);
 }
 
-static int kd35t133_remove(struct mipi_dsi_device *dsi)
+static void kd35t133_remove(struct mipi_dsi_device *dsi)
 {
        struct kd35t133 *ctx = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -333,8 +333,6 @@ static int kd35t133_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret);
 
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id kd35t133_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c b/drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
index cb0bb30760994878e01d014e8d1fed6aa535337e..76572c9229836eb8c687dc7c0214b38199eb8827 100644 (file)
--- a/drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
+++ b/drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
@@ -486,14 +486,12 @@ static int k101_im2ba02_dsi_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int k101_im2ba02_dsi_remove(struct mipi_dsi_device *dsi)
+static void k101_im2ba02_dsi_remove(struct mipi_dsi_device *dsi)
 {
        struct k101_im2ba02 *ctx = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id k101_im2ba02_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c b/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
index ee61d60eceae179e488c140085b432f5b3555b24..df493da50afece6b7faa1d2f87458e8cfdeb38ea 100644 (file)
--- a/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
+++ b/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
@@ -233,14 +233,12 @@ static int feiyang_dsi_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int feiyang_dsi_remove(struct mipi_dsi_device *dsi)
+static void feiyang_dsi_remove(struct mipi_dsi_device *dsi)
 {
        struct feiyang *ctx = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id feiyang_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
index 596861269774f2af6dc3df72f8247fea0c8ff0a2..cbb68caa36f267690ae9e737773bd15f6256785c 100644 (file)
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
@@ -923,14 +923,12 @@ static int ili9881c_dsi_probe(struct mipi_dsi_device *dsi)
        return mipi_dsi_attach(dsi);
 }
 
-static int ili9881c_dsi_remove(struct mipi_dsi_device *dsi)
+static void ili9881c_dsi_remove(struct mipi_dsi_device *dsi)
 {
        struct ili9881c *ctx = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct ili9881c_desc lhr050h41_desc = {

diff --git a/drivers/gpu/drm/panel/panel-innolux-p079zca.c b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
index f194b62e290cae561b2c2b188701481f6aa4ee73..9992d0d4c0e5c54281fb201818d2644f931c403b 100644 (file)
--- a/drivers/gpu/drm/panel/panel-innolux-p079zca.c
+++ b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
@@ -506,7 +506,7 @@ static int innolux_panel_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int innolux_panel_remove(struct mipi_dsi_device *dsi)
+static void innolux_panel_remove(struct mipi_dsi_device *dsi)
 {
        struct innolux_panel *innolux = mipi_dsi_get_drvdata(dsi);
        int err;
@@ -524,8 +524,6 @@ static int innolux_panel_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", err);
 
        innolux_panel_del(innolux);
-
-       return 0;
 }
 
 static void innolux_panel_shutdown(struct mipi_dsi_device *dsi)

diff --git a/drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c b/drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c
index 31eafbc38ec0c36aaa39947ac9e8b1aeb5c7c61d..d8765b2294fbebf95d61113e8bad48cfaee8df7d 100644 (file)
--- a/drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c
+++ b/drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c
@@ -288,7 +288,7 @@ static int jdi_fhd_r63452_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int jdi_fhd_r63452_remove(struct mipi_dsi_device *dsi)
+static void jdi_fhd_r63452_remove(struct mipi_dsi_device *dsi)
 {
        struct jdi_fhd_r63452 *ctx = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -298,8 +298,6 @@ static int jdi_fhd_r63452_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret);
 
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id jdi_fhd_r63452_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
index 3c86ad262d5e013a5285f7feec302a2580f5cfba..8f4f137a2af6b9c26cf56a7d26fb1fed67f9e7cd 100644 (file)
--- a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
+++ b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
@@ -482,7 +482,7 @@ static int jdi_panel_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int jdi_panel_remove(struct mipi_dsi_device *dsi)
+static void jdi_panel_remove(struct mipi_dsi_device *dsi)
 {
        struct jdi_panel *jdi = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -497,8 +497,6 @@ static int jdi_panel_remove(struct mipi_dsi_device *dsi)
                        ret);
 
        jdi_panel_del(jdi);
-
-       return 0;
 }
 
 static void jdi_panel_shutdown(struct mipi_dsi_device *dsi)

diff --git a/drivers/gpu/drm/panel/panel-khadas-ts050.c b/drivers/gpu/drm/panel/panel-khadas-ts050.c
index a3ec4cbdbf7aadc0ae9a060a19d53ebe3bced7da..1ab1ebe30882077f3b9f76e8f225c47fb9038e97 100644 (file)
--- a/drivers/gpu/drm/panel/panel-khadas-ts050.c
+++ b/drivers/gpu/drm/panel/panel-khadas-ts050.c
@@ -830,7 +830,7 @@ static int khadas_ts050_panel_probe(struct mipi_dsi_device *dsi)
        return err;
 }
 
-static int khadas_ts050_panel_remove(struct mipi_dsi_device *dsi)
+static void khadas_ts050_panel_remove(struct mipi_dsi_device *dsi)
 {
        struct khadas_ts050_panel *khadas_ts050 = mipi_dsi_get_drvdata(dsi);
        int err;
@@ -842,8 +842,6 @@ static int khadas_ts050_panel_remove(struct mipi_dsi_device *dsi)
        drm_panel_remove(&khadas_ts050->base);
        drm_panel_disable(&khadas_ts050->base);
        drm_panel_unprepare(&khadas_ts050->base);
-
-       return 0;
 }
 
 static void khadas_ts050_panel_shutdown(struct mipi_dsi_device *dsi)

diff --git a/drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c b/drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c
index daccb1fd5fdad82dcdfd8caacfe89e43a5bb5746..17f8d80cf2b36935a9845a7a0dbe63b4f70198d4 100644 (file)
--- a/drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c
+++ b/drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c
@@ -415,7 +415,7 @@ static int kingdisplay_panel_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int kingdisplay_panel_remove(struct mipi_dsi_device *dsi)
+static void kingdisplay_panel_remove(struct mipi_dsi_device *dsi)
 {
        struct kingdisplay_panel *kingdisplay = mipi_dsi_get_drvdata(dsi);
        int err;
@@ -433,8 +433,6 @@ static int kingdisplay_panel_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", err);
 
        kingdisplay_panel_del(kingdisplay);
-
-       return 0;
 }
 
 static void kingdisplay_panel_shutdown(struct mipi_dsi_device *dsi)

diff --git a/drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c b/drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c
index a5a414920430d1781ae37dc38fb397da6c946d93..5619f186d28cf524237720256eb108a9ee293147 100644 (file)
--- a/drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c
+++ b/drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c
@@ -628,7 +628,7 @@ static void ltk050h3146w_shutdown(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret);
 }
 
-static int ltk050h3146w_remove(struct mipi_dsi_device *dsi)
+static void ltk050h3146w_remove(struct mipi_dsi_device *dsi)
 {
        struct ltk050h3146w *ctx = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -640,8 +640,6 @@ static int ltk050h3146w_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret);
 
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id ltk050h3146w_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c b/drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c
index 21e48923836d4a2b01b10e7dde3c78ba9d95fbe9..39e408c9f762f2690a7ba1c0347b4ef2848b50c7 100644 (file)
--- a/drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c
+++ b/drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c
@@ -477,7 +477,7 @@ static void ltk500hd1829_shutdown(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret);
 }
 
-static int ltk500hd1829_remove(struct mipi_dsi_device *dsi)
+static void ltk500hd1829_remove(struct mipi_dsi_device *dsi)
 {
        struct ltk500hd1829 *ctx = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -489,8 +489,6 @@ static int ltk500hd1829_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", ret);
 
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id ltk500hd1829_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c b/drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c
index 31daae1da9c9c6479dfaf0a30b8672f2d482d4df..772e3b6acece819c736d499d056b2886c089353b 100644 (file)
--- a/drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c
+++ b/drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c
@@ -336,7 +336,7 @@ static void mantix_shutdown(struct mipi_dsi_device *dsi)
        drm_panel_disable(&ctx->panel);
 }
 
-static int mantix_remove(struct mipi_dsi_device *dsi)
+static void mantix_remove(struct mipi_dsi_device *dsi)
 {
        struct mantix *ctx = mipi_dsi_get_drvdata(dsi);
 
@@ -344,8 +344,6 @@ static int mantix_remove(struct mipi_dsi_device *dsi)
 
        mipi_dsi_detach(dsi);
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id mantix_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-novatek-nt35510.c b/drivers/gpu/drm/panel/panel-novatek-nt35510.c
index 1b3e0154bfb8a0eedb4157f4d4fa3c1c7d3c6f4b..c613ad967ba6ba8d29200751e96fd0afd6642489 100644 (file)
--- a/drivers/gpu/drm/panel/panel-novatek-nt35510.c
+++ b/drivers/gpu/drm/panel/panel-novatek-nt35510.c
@@ -966,7 +966,7 @@ static int nt35510_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int nt35510_remove(struct mipi_dsi_device *dsi)
+static void nt35510_remove(struct mipi_dsi_device *dsi)
 {
        struct nt35510 *nt = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -978,8 +978,6 @@ static int nt35510_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to power off\n");
 
        drm_panel_remove(&nt->panel);
-
-       return 0;
 }
 
 /*

diff --git a/drivers/gpu/drm/panel/panel-novatek-nt35560.c b/drivers/gpu/drm/panel/panel-novatek-nt35560.c
index 1b6042321ea1d4515ecba18576068f42a7b25b9f..cc7f96d70826322475b4a2345d8cf96608431dff 100644 (file)
--- a/drivers/gpu/drm/panel/panel-novatek-nt35560.c
+++ b/drivers/gpu/drm/panel/panel-novatek-nt35560.c
@@ -523,14 +523,12 @@ static int nt35560_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int nt35560_remove(struct mipi_dsi_device *dsi)
+static void nt35560_remove(struct mipi_dsi_device *dsi)
 {
        struct nt35560 *nt = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_panel_remove(&nt->panel);
-
-       return 0;
 }
 
 static const struct of_device_id nt35560_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-novatek-nt35950.c b/drivers/gpu/drm/panel/panel-novatek-nt35950.c
index 288c7fa83ecc53a1ebf4e19816244c852802478f..3a844917da075b1251f055cfe40b7045518929cb 100644 (file)
--- a/drivers/gpu/drm/panel/panel-novatek-nt35950.c
+++ b/drivers/gpu/drm/panel/panel-novatek-nt35950.c
@@ -620,7 +620,7 @@ static int nt35950_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int nt35950_remove(struct mipi_dsi_device *dsi)
+static void nt35950_remove(struct mipi_dsi_device *dsi)
 {
        struct nt35950 *nt = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -639,8 +639,6 @@ static int nt35950_remove(struct mipi_dsi_device *dsi)
        }
 
        drm_panel_remove(&nt->panel);
-
-       return 0;
 }
 
 static const struct nt35950_panel_mode sharp_ls055d1sx04_modes[] = {

diff --git a/drivers/gpu/drm/panel/panel-novatek-nt36672a.c b/drivers/gpu/drm/panel/panel-novatek-nt36672a.c
index 6d6ce42787e2c063526c2307d907943bd398f412..73bcffa1e0c151eb3f1ca852b27c60b8fdc5e2cf 100644 (file)
--- a/drivers/gpu/drm/panel/panel-novatek-nt36672a.c
+++ b/drivers/gpu/drm/panel/panel-novatek-nt36672a.c
@@ -669,7 +669,7 @@ static int nt36672a_panel_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int nt36672a_panel_remove(struct mipi_dsi_device *dsi)
+static void nt36672a_panel_remove(struct mipi_dsi_device *dsi)
 {
        struct nt36672a_panel *pinfo = mipi_dsi_get_drvdata(dsi);
        int err;
@@ -687,8 +687,6 @@ static int nt36672a_panel_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", err);
 
        drm_panel_remove(&pinfo->base);
-
-       return 0;
 }
 
 static void nt36672a_panel_shutdown(struct mipi_dsi_device *dsi)

diff --git a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
index dfb43b1374e75edc9a3fe2998fed53b377bd232c..b4729a94c34a8e2c99d412815128529c23595ef2 100644 (file)
--- a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
+++ b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
@@ -497,14 +497,12 @@ static int otm8009a_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int otm8009a_remove(struct mipi_dsi_device *dsi)
+static void otm8009a_remove(struct mipi_dsi_device *dsi)
 {
        struct otm8009a *ctx = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id orisetech_otm8009a_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c b/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
index 198493a6eb6a5e689f6a2519b10437f17767dcf9..493e0504f6f727dbeaccc459abf10973b02bda82 100644 (file)
--- a/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
+++ b/drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
@@ -206,7 +206,7 @@ static int osd101t2587_panel_probe(struct mipi_dsi_device *dsi)
        return ret;
 }
 
-static int osd101t2587_panel_remove(struct mipi_dsi_device *dsi)
+static void osd101t2587_panel_remove(struct mipi_dsi_device *dsi)
 {
        struct osd101t2587_panel *osd101t2587 = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -221,8 +221,6 @@ static int osd101t2587_panel_remove(struct mipi_dsi_device *dsi)
        ret = mipi_dsi_detach(dsi);
        if (ret < 0)
                dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", ret);
-
-       return ret;
 }
 
 static void osd101t2587_panel_shutdown(struct mipi_dsi_device *dsi)

diff --git a/drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c b/drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c
index 3991f5d950af49eb11702e39143fbde8b4f9fba9..8ba6d82879381e9669e5669a09ea611c15adf590 100644 (file)
--- a/drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c
+++ b/drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c
@@ -250,7 +250,7 @@ static int wuxga_nt_panel_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int wuxga_nt_panel_remove(struct mipi_dsi_device *dsi)
+static void wuxga_nt_panel_remove(struct mipi_dsi_device *dsi)
 {
        struct wuxga_nt_panel *wuxga_nt = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -264,8 +264,6 @@ static int wuxga_nt_panel_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", ret);
 
        wuxga_nt_panel_del(wuxga_nt);
-
-       return 0;
 }
 
 static void wuxga_nt_panel_shutdown(struct mipi_dsi_device *dsi)

diff --git a/drivers/gpu/drm/panel/panel-raydium-rm67191.c b/drivers/gpu/drm/panel/panel-raydium-rm67191.c
index 4e021a57221128d741f18242245e4951276e1f1c..dbb1ed4efbed095ad12fc881160ad392710d3e2a 100644 (file)
--- a/drivers/gpu/drm/panel/panel-raydium-rm67191.c
+++ b/drivers/gpu/drm/panel/panel-raydium-rm67191.c
@@ -616,7 +616,7 @@ static int rad_panel_probe(struct mipi_dsi_device *dsi)
        return ret;
 }
 
-static int rad_panel_remove(struct mipi_dsi_device *dsi)
+static void rad_panel_remove(struct mipi_dsi_device *dsi)
 {
        struct rad_panel *rad = mipi_dsi_get_drvdata(dsi);
        struct device *dev = &dsi->dev;
@@ -627,8 +627,6 @@ static int rad_panel_remove(struct mipi_dsi_device *dsi)
                dev_err(dev, "Failed to detach from host (%d)\n", ret);
 
        drm_panel_remove(&rad->panel);
-
-       return 0;
 }
 
 static void rad_panel_shutdown(struct mipi_dsi_device *dsi)

diff --git a/drivers/gpu/drm/panel/panel-raydium-rm68200.c b/drivers/gpu/drm/panel/panel-raydium-rm68200.c
index 412c0dbcb2b6f25cb93e5d98590430ab73e2cf49..5f9b340588fb25d7984c7500764347c4be65520c 100644 (file)
--- a/drivers/gpu/drm/panel/panel-raydium-rm68200.c
+++ b/drivers/gpu/drm/panel/panel-raydium-rm68200.c
@@ -412,14 +412,12 @@ static int rm68200_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int rm68200_remove(struct mipi_dsi_device *dsi)
+static void rm68200_remove(struct mipi_dsi_device *dsi)
 {
        struct rm68200 *ctx = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id raydium_rm68200_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-ronbo-rb070d30.c b/drivers/gpu/drm/panel/panel-ronbo-rb070d30.c
index 1fb579a574d9f52ccd484db2010e91da44cdbd3c..a8a98c91b13c716275f11ff2835253c688da0f98 100644 (file)
--- a/drivers/gpu/drm/panel/panel-ronbo-rb070d30.c
+++ b/drivers/gpu/drm/panel/panel-ronbo-rb070d30.c
@@ -208,14 +208,12 @@ static int rb070d30_panel_dsi_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int rb070d30_panel_dsi_remove(struct mipi_dsi_device *dsi)
+static void rb070d30_panel_dsi_remove(struct mipi_dsi_device *dsi)
 {
        struct rb070d30_panel *ctx = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id rb070d30_panel_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c b/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
index 70560cac53a99e1a9d7709df7203feedba73a37b..008e2b0d6652b6239bd4633a620988897493a74a 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
@@ -212,14 +212,12 @@ static int s6d16d0_probe(struct mipi_dsi_device *dsi)
        return ret;
 }
 
-static int s6d16d0_remove(struct mipi_dsi_device *dsi)
+static void s6d16d0_remove(struct mipi_dsi_device *dsi)
 {
        struct s6d16d0 *s6 = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_panel_remove(&s6->panel);
-
-       return 0;
 }
 
 static const struct of_device_id s6d16d0_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c b/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
index 0ab1b7ec84cdaf7cb68e6de4c6dddedbc39f5479..5c621b15e84c2e1f4d409966cc5b2dfea3c92b90 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
@@ -747,15 +747,13 @@ remove_panel:
        return ret;
 }
 
-static int s6e3ha2_remove(struct mipi_dsi_device *dsi)
+static void s6e3ha2_remove(struct mipi_dsi_device *dsi)
 {
        struct s6e3ha2 *ctx = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_panel_remove(&ctx->panel);
        backlight_device_unregister(ctx->bl_dev);
-
-       return 0;
 }
 
 static const struct of_device_id s6e3ha2_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c b/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
index e38262b67ff7e08cceab2cbf00805a4392579a39..e06fd35de814bd162711314c2aeeef8b49a4b2e3 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
@@ -488,7 +488,7 @@ remove_panel:
        return ret;
 }
 
-static int s6e63j0x03_remove(struct mipi_dsi_device *dsi)
+static void s6e63j0x03_remove(struct mipi_dsi_device *dsi)
 {
        struct s6e63j0x03 *ctx = mipi_dsi_get_drvdata(dsi);
 
@@ -496,8 +496,6 @@ static int s6e63j0x03_remove(struct mipi_dsi_device *dsi)
        drm_panel_remove(&ctx->panel);
 
        backlight_device_unregister(ctx->bl_dev);
-
-       return 0;
 }
 
 static const struct of_device_id s6e63j0x03_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c b/drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c
index e0f773678168d82c6132baf3b65bbdab5ca03e31..ed3895e4ca5e75aa0d6c8d2fd0d875a1c866ef24 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c
@@ -113,11 +113,10 @@ static int s6e63m0_dsi_probe(struct mipi_dsi_device *dsi)
        return ret;
 }
 
-static int s6e63m0_dsi_remove(struct mipi_dsi_device *dsi)
+static void s6e63m0_dsi_remove(struct mipi_dsi_device *dsi)
 {
        mipi_dsi_detach(dsi);
        s6e63m0_remove(&dsi->dev);
-       return 0;
 }
 
 static const struct of_device_id s6e63m0_dsi_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams452ef01.c b/drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams452ef01.c
index 29fde3823212bf8715d7876c4eb781fb2ae02217..97ff7a18545c3f6e2a78cdecc30da8c00173d010 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams452ef01.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams452ef01.c
@@ -254,7 +254,7 @@ static int s6e88a0_ams452ef01_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int s6e88a0_ams452ef01_remove(struct mipi_dsi_device *dsi)
+static void s6e88a0_ams452ef01_remove(struct mipi_dsi_device *dsi)
 {
        struct s6e88a0_ams452ef01 *ctx = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -264,8 +264,6 @@ static int s6e88a0_ams452ef01_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret);
 
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id s6e88a0_ams452ef01_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c b/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
index 9b3599d6d2dea20f3acfdce0c455f08add507ca2..54213beafaf5ebeaf4dabf141726a0fc5acfa87b 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
@@ -1028,14 +1028,12 @@ static int s6e8aa0_probe(struct mipi_dsi_device *dsi)
        return ret;
 }
 
-static int s6e8aa0_remove(struct mipi_dsi_device *dsi)
+static void s6e8aa0_remove(struct mipi_dsi_device *dsi)
 {
        struct s6e8aa0 *ctx = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id s6e8aa0_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-samsung-sofef00.c b/drivers/gpu/drm/panel/panel-samsung-sofef00.c
index 1fb37fda4ba96d4d23d9d81db8c1c2eca5e500f7..1a0d24595faa540eeda78517a0f3ab7e2abcd8e5 100644 (file)
--- a/drivers/gpu/drm/panel/panel-samsung-sofef00.c
+++ b/drivers/gpu/drm/panel/panel-samsung-sofef00.c
@@ -305,7 +305,7 @@ static int sofef00_panel_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int sofef00_panel_remove(struct mipi_dsi_device *dsi)
+static void sofef00_panel_remove(struct mipi_dsi_device *dsi)
 {
        struct sofef00_panel *ctx = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -315,8 +315,6 @@ static int sofef00_panel_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret);
 
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id sofef00_panel_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c b/drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c
index f8cd2a42ed13bd25fd653deebb5416d865db1702..14851408a5e15a240a718f834cffaaf10a8bba07 100644 (file)
--- a/drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c
+++ b/drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c
@@ -391,7 +391,7 @@ static int sharp_panel_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int sharp_panel_remove(struct mipi_dsi_device *dsi)
+static void sharp_panel_remove(struct mipi_dsi_device *dsi)
 {
        struct sharp_panel *sharp = mipi_dsi_get_drvdata(dsi);
        int err;
@@ -399,7 +399,7 @@ static int sharp_panel_remove(struct mipi_dsi_device *dsi)
        /* only detach from host for the DSI-LINK2 interface */
        if (!sharp) {
                mipi_dsi_detach(dsi);
-               return 0;
+               return;
        }
 
        err = drm_panel_disable(&sharp->base);
@@ -411,8 +411,6 @@ static int sharp_panel_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", err);
 
        sharp_panel_del(sharp);
-
-       return 0;
 }
 
 static void sharp_panel_shutdown(struct mipi_dsi_device *dsi)

diff --git a/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c b/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c
index 25829a0a8e80129f538d9a3417d7a0ca51630e3e..d1ec80a3e3c72228beb56a763827801b533d2a6b 100644 (file)
--- a/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c
+++ b/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c
@@ -305,7 +305,7 @@ static int sharp_nt_panel_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int sharp_nt_panel_remove(struct mipi_dsi_device *dsi)
+static void sharp_nt_panel_remove(struct mipi_dsi_device *dsi)
 {
        struct sharp_nt_panel *sharp_nt = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -319,8 +319,6 @@ static int sharp_nt_panel_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", ret);
 
        sharp_nt_panel_del(sharp_nt);
-
-       return 0;
 }
 
 static void sharp_nt_panel_shutdown(struct mipi_dsi_device *dsi)

diff --git a/drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c b/drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c
index e12570561629c2833e27b2f44b7b05bb13a77cf1..8a4e0c1fe73ff239d8624af0a92b10291d8044d5 100644 (file)
--- a/drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c
+++ b/drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c
@@ -298,7 +298,7 @@ static int sharp_ls060_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int sharp_ls060_remove(struct mipi_dsi_device *dsi)
+static void sharp_ls060_remove(struct mipi_dsi_device *dsi)
 {
        struct sharp_ls060 *ctx = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -308,8 +308,6 @@ static int sharp_ls060_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret);
 
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id sharp_ls060t1sx01_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
index 0ad3d1de4a98de5a48546d6f845aa68695d5d49e..c1d224cb719da786e038e2e5432dad2594084c1b 100644 (file)
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -4566,7 +4566,7 @@ static int panel_simple_dsi_probe(struct mipi_dsi_device *dsi)
        return err;
 }
 
-static int panel_simple_dsi_remove(struct mipi_dsi_device *dsi)
+static void panel_simple_dsi_remove(struct mipi_dsi_device *dsi)
 {
        int err;
 
@@ -4575,8 +4575,6 @@ static int panel_simple_dsi_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", err);
 
        panel_simple_remove(&dsi->dev);
-
-       return 0;
 }
 
 static void panel_simple_dsi_shutdown(struct mipi_dsi_device *dsi)

diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7701.c b/drivers/gpu/drm/panel/panel-sitronix-st7701.c
index 320a2a8fd4592baf2e3a999fc0a94a78ca9d78f7..5192d9aa572a77d95c61945423459d779ad0dd0a 100644 (file)
--- a/drivers/gpu/drm/panel/panel-sitronix-st7701.c
+++ b/drivers/gpu/drm/panel/panel-sitronix-st7701.c
@@ -387,14 +387,12 @@ static int st7701_dsi_probe(struct mipi_dsi_device *dsi)
        return mipi_dsi_attach(dsi);
 }
 
-static int st7701_dsi_remove(struct mipi_dsi_device *dsi)
+static void st7701_dsi_remove(struct mipi_dsi_device *dsi)
 {
        struct st7701 *st7701 = mipi_dsi_get_drvdata(dsi);
 
        mipi_dsi_detach(dsi);
        drm_panel_remove(&st7701->panel);
-
-       return 0;
 }
 
 static const struct of_device_id st7701_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
index 73f69c929a7566d5d9fe525e7f2781c4eb8c9e20..86a472b01360b358934060bd0193c0c10cc03388 100644 (file)
--- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c
+++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
@@ -598,7 +598,7 @@ static void st7703_shutdown(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret);
 }
 
-static int st7703_remove(struct mipi_dsi_device *dsi)
+static void st7703_remove(struct mipi_dsi_device *dsi)
 {
        struct st7703 *ctx = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -612,8 +612,6 @@ static int st7703_remove(struct mipi_dsi_device *dsi)
        drm_panel_remove(&ctx->panel);
 
        st7703_debugfs_remove(ctx);
-
-       return 0;
 }
 
 static const struct of_device_id st7703_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c b/drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c
index 69f07b15fca4f9dd6069e3c39ae7b6d9a3eb1c0e..fa9be3c299c08a01a2113171ed23c6804052150e 100644 (file)
--- a/drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c
+++ b/drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c
@@ -517,7 +517,7 @@ static int truly_nt35521_probe(struct mipi_dsi_device *dsi)
        return 0;
 }
 
-static int truly_nt35521_remove(struct mipi_dsi_device *dsi)
+static void truly_nt35521_remove(struct mipi_dsi_device *dsi)
 {
        struct truly_nt35521 *ctx = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -527,8 +527,6 @@ static int truly_nt35521_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret);
 
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id truly_nt35521_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c b/drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c
index 820731be7147092910c2c26430ef77da59f8f929..d8487bc6d61131f819d300ddda21e971b979b312 100644 (file)
--- a/drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c
+++ b/drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c
@@ -210,7 +210,7 @@ static int tdo_tl070wsh30_panel_probe(struct mipi_dsi_device *dsi)
        return mipi_dsi_attach(dsi);
 }
 
-static int tdo_tl070wsh30_panel_remove(struct mipi_dsi_device *dsi)
+static void tdo_tl070wsh30_panel_remove(struct mipi_dsi_device *dsi)
 {
        struct tdo_tl070wsh30_panel *tdo_tl070wsh30 = mipi_dsi_get_drvdata(dsi);
        int err;
@@ -222,8 +222,6 @@ static int tdo_tl070wsh30_panel_remove(struct mipi_dsi_device *dsi)
        drm_panel_remove(&tdo_tl070wsh30->base);
        drm_panel_disable(&tdo_tl070wsh30->base);
        drm_panel_unprepare(&tdo_tl070wsh30->base);
-
-       return 0;
 }
 
 static void tdo_tl070wsh30_panel_shutdown(struct mipi_dsi_device *dsi)

diff --git a/drivers/gpu/drm/panel/panel-truly-nt35597.c b/drivers/gpu/drm/panel/panel-truly-nt35597.c
index 9ca5c7ff41d6547c30b9fe35936a83634e5f98e4..b31cffb660a7720af33aea141bc7579b7a88d2cf 100644 (file)
--- a/drivers/gpu/drm/panel/panel-truly-nt35597.c
+++ b/drivers/gpu/drm/panel/panel-truly-nt35597.c
@@ -616,7 +616,7 @@ err_panel_add:
        return ret;
 }
 
-static int truly_nt35597_remove(struct mipi_dsi_device *dsi)
+static void truly_nt35597_remove(struct mipi_dsi_device *dsi)
 {
        struct truly_nt35597 *ctx = mipi_dsi_get_drvdata(dsi);
 
@@ -628,7 +628,6 @@ static int truly_nt35597_remove(struct mipi_dsi_device *dsi)
        }
 
        drm_panel_remove(&ctx->panel);
-       return 0;
 }
 
 static const struct of_device_id truly_nt35597_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-visionox-rm69299.c b/drivers/gpu/drm/panel/panel-visionox-rm69299.c
index db2443ac81d33515b77f132eac4d9fa0c3645f34..ec228c269146f0c5177de3a16ccbe04010ed8339 100644 (file)
--- a/drivers/gpu/drm/panel/panel-visionox-rm69299.c
+++ b/drivers/gpu/drm/panel/panel-visionox-rm69299.c
@@ -256,7 +256,7 @@ err_dsi_attach:
        return ret;
 }
 
-static int visionox_rm69299_remove(struct mipi_dsi_device *dsi)
+static void visionox_rm69299_remove(struct mipi_dsi_device *dsi)
 {
        struct visionox_rm69299 *ctx = mipi_dsi_get_drvdata(dsi);
 
@@ -264,7 +264,6 @@ static int visionox_rm69299_remove(struct mipi_dsi_device *dsi)
        mipi_dsi_device_unregister(ctx->dsi);
 
        drm_panel_remove(&ctx->panel);
-       return 0;
 }
 
 static const struct of_device_id visionox_rm69299_of_match[] = {

diff --git a/drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c b/drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c
index 8177f5a360fb27c192955ca1547a36aface23053..2c54733ee241a78a9faac91d6cfa08737ee7e459 100644 (file)
--- a/drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c
+++ b/drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c
@@ -339,7 +339,7 @@ static void xpp055c272_shutdown(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret);
 }
 
-static int xpp055c272_remove(struct mipi_dsi_device *dsi)
+static void xpp055c272_remove(struct mipi_dsi_device *dsi)
 {
        struct xpp055c272 *ctx = mipi_dsi_get_drvdata(dsi);
        int ret;
@@ -351,8 +351,6 @@ static int xpp055c272_remove(struct mipi_dsi_device *dsi)
                dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret);
 
        drm_panel_remove(&ctx->panel);
-
-       return 0;
 }
 
 static const struct of_device_id xpp055c272_of_match[] = {

diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h
index 91a164bdd8f3c879ef0464f596489e9bb233a17f..53e3a8a2f24170fec9ffc8d6391d825721db5188 100644 (file)
--- a/include/drm/drm_mipi_dsi.h
+++ b/include/drm/drm_mipi_dsi.h
@@ -322,7 +322,7 @@ int mipi_dsi_dcs_get_display_brightness(struct mipi_dsi_device *dsi,
 struct mipi_dsi_driver {
        struct device_driver driver;
        int(*probe)(struct mipi_dsi_device *dsi);
-       int(*remove)(struct mipi_dsi_device *dsi);
+       void (*remove)(struct mipi_dsi_device *dsi);
        void (*shutdown)(struct mipi_dsi_device *dsi);
 };