Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Uwe Kleine-König and committed by
Sam Ravnborg
79abca2b 1fd452c4

+54 -147
+1 -3
drivers/gpu/drm/bridge/chipone-icn6211.c
··· 735 735 return chipone_dsi_host_attach(icn); 736 736 } 737 737 738 - static int chipone_dsi_remove(struct mipi_dsi_device *dsi) 738 + static void chipone_dsi_remove(struct mipi_dsi_device *dsi) 739 739 { 740 740 struct chipone *icn = mipi_dsi_get_drvdata(dsi); 741 741 742 742 mipi_dsi_detach(dsi); 743 743 drm_bridge_remove(&icn->bridge); 744 - 745 - return 0; 746 744 } 747 745 748 746 static const struct of_device_id chipone_of_match[] = {
+1 -3
drivers/gpu/drm/bridge/tc358762.c
··· 241 241 return ret; 242 242 } 243 243 244 - static int tc358762_remove(struct mipi_dsi_device *dsi) 244 + static void tc358762_remove(struct mipi_dsi_device *dsi) 245 245 { 246 246 struct tc358762 *ctx = mipi_dsi_get_drvdata(dsi); 247 247 248 248 mipi_dsi_detach(dsi); 249 249 drm_bridge_remove(&ctx->bridge); 250 - 251 - return 0; 252 250 } 253 251 254 252 static const struct of_device_id tc358762_of_match[] = {
+1 -3
drivers/gpu/drm/bridge/tc358764.c
··· 381 381 return ret; 382 382 } 383 383 384 - static int tc358764_remove(struct mipi_dsi_device *dsi) 384 + static void tc358764_remove(struct mipi_dsi_device *dsi) 385 385 { 386 386 struct tc358764 *ctx = mipi_dsi_get_drvdata(dsi); 387 387 388 388 mipi_dsi_detach(dsi); 389 389 drm_bridge_remove(&ctx->bridge); 390 - 391 - return 0; 392 390 } 393 391 394 392 static const struct of_device_id tc358764_of_match[] = {
+3 -1
drivers/gpu/drm/drm_mipi_dsi.c
··· 1236 1236 struct mipi_dsi_driver *drv = to_mipi_dsi_driver(dev->driver); 1237 1237 struct mipi_dsi_device *dsi = to_mipi_dsi_device(dev); 1238 1238 1239 - return drv->remove(dsi); 1239 + drv->remove(dsi); 1240 + 1241 + return 0; 1240 1242 } 1241 1243 1242 1244 static void mipi_dsi_drv_shutdown(struct device *dev)
+1 -3
drivers/gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c
··· 321 321 return 0; 322 322 } 323 323 324 - static int tm5p5_nt35596_remove(struct mipi_dsi_device *dsi) 324 + static void tm5p5_nt35596_remove(struct mipi_dsi_device *dsi) 325 325 { 326 326 struct tm5p5_nt35596 *ctx = mipi_dsi_get_drvdata(dsi); 327 327 int ret; ··· 332 332 "Failed to detach from DSI host: %d\n", ret); 333 333 334 334 drm_panel_remove(&ctx->panel); 335 - 336 - return 0; 337 335 } 338 336 339 337 static const struct of_device_id tm5p5_nt35596_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c
··· 410 410 return 0; 411 411 } 412 412 413 - static int boe_bf060y8m_aj0_remove(struct mipi_dsi_device *dsi) 413 + static void boe_bf060y8m_aj0_remove(struct mipi_dsi_device *dsi) 414 414 { 415 415 struct boe_bf060y8m_aj0 *boe = mipi_dsi_get_drvdata(dsi); 416 416 int ret; ··· 420 420 dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); 421 421 422 422 drm_panel_remove(&boe->panel); 423 - 424 - return 0; 425 423 } 426 424 427 425 static const struct of_device_id boe_bf060y8m_aj0_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-boe-himax8279d.c
··· 919 919 return err; 920 920 } 921 921 922 - static int panel_remove(struct mipi_dsi_device *dsi) 922 + static void panel_remove(struct mipi_dsi_device *dsi) 923 923 { 924 924 struct panel_info *pinfo = mipi_dsi_get_drvdata(dsi); 925 925 int err; ··· 937 937 dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", err); 938 938 939 939 drm_panel_remove(&pinfo->base); 940 - 941 - return 0; 942 940 } 943 941 944 942 static void panel_shutdown(struct mipi_dsi_device *dsi)
+1 -3
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
··· 1622 1622 drm_panel_unprepare(&boe->base); 1623 1623 } 1624 1624 1625 - static int boe_panel_remove(struct mipi_dsi_device *dsi) 1625 + static void boe_panel_remove(struct mipi_dsi_device *dsi) 1626 1626 { 1627 1627 struct boe_panel *boe = mipi_dsi_get_drvdata(dsi); 1628 1628 int ret; ··· 1635 1635 1636 1636 if (boe->base.dev) 1637 1637 drm_panel_remove(&boe->base); 1638 - 1639 - return 0; 1640 1638 } 1641 1639 1642 1640 static const struct of_device_id boe_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-dsi-cm.c
··· 579 579 return r; 580 580 } 581 581 582 - static int dsicm_remove(struct mipi_dsi_device *dsi) 582 + static void dsicm_remove(struct mipi_dsi_device *dsi) 583 583 { 584 584 struct panel_drv_data *ddata = mipi_dsi_get_drvdata(dsi); 585 585 ··· 593 593 594 594 if (ddata->extbldev) 595 595 put_device(&ddata->extbldev->dev); 596 - 597 - return 0; 598 596 } 599 597 600 598 static const struct dsic_panel_data taal_data = {
+1 -3
drivers/gpu/drm/panel/panel-ebbg-ft8719.c
··· 250 250 return 0; 251 251 } 252 252 253 - static int ebbg_ft8719_remove(struct mipi_dsi_device *dsi) 253 + static void ebbg_ft8719_remove(struct mipi_dsi_device *dsi) 254 254 { 255 255 struct ebbg_ft8719 *ctx = mipi_dsi_get_drvdata(dsi); 256 256 int ret; ··· 260 260 dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); 261 261 262 262 drm_panel_remove(&ctx->panel); 263 - 264 - return 0; 265 263 } 266 264 267 265 static const struct of_device_id ebbg_ft8719_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-elida-kd35t133.c
··· 321 321 dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret); 322 322 } 323 323 324 - static int kd35t133_remove(struct mipi_dsi_device *dsi) 324 + static void kd35t133_remove(struct mipi_dsi_device *dsi) 325 325 { 326 326 struct kd35t133 *ctx = mipi_dsi_get_drvdata(dsi); 327 327 int ret; ··· 333 333 dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); 334 334 335 335 drm_panel_remove(&ctx->panel); 336 - 337 - return 0; 338 336 } 339 337 340 338 static const struct of_device_id kd35t133_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
··· 486 486 return 0; 487 487 } 488 488 489 - static int k101_im2ba02_dsi_remove(struct mipi_dsi_device *dsi) 489 + static void k101_im2ba02_dsi_remove(struct mipi_dsi_device *dsi) 490 490 { 491 491 struct k101_im2ba02 *ctx = mipi_dsi_get_drvdata(dsi); 492 492 493 493 mipi_dsi_detach(dsi); 494 494 drm_panel_remove(&ctx->panel); 495 - 496 - return 0; 497 495 } 498 496 499 497 static const struct of_device_id k101_im2ba02_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
··· 233 233 return 0; 234 234 } 235 235 236 - static int feiyang_dsi_remove(struct mipi_dsi_device *dsi) 236 + static void feiyang_dsi_remove(struct mipi_dsi_device *dsi) 237 237 { 238 238 struct feiyang *ctx = mipi_dsi_get_drvdata(dsi); 239 239 240 240 mipi_dsi_detach(dsi); 241 241 drm_panel_remove(&ctx->panel); 242 - 243 - return 0; 244 242 } 245 243 246 244 static const struct of_device_id feiyang_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
··· 923 923 return mipi_dsi_attach(dsi); 924 924 } 925 925 926 - static int ili9881c_dsi_remove(struct mipi_dsi_device *dsi) 926 + static void ili9881c_dsi_remove(struct mipi_dsi_device *dsi) 927 927 { 928 928 struct ili9881c *ctx = mipi_dsi_get_drvdata(dsi); 929 929 930 930 mipi_dsi_detach(dsi); 931 931 drm_panel_remove(&ctx->panel); 932 - 933 - return 0; 934 932 } 935 933 936 934 static const struct ili9881c_desc lhr050h41_desc = {
+1 -3
drivers/gpu/drm/panel/panel-innolux-p079zca.c
··· 506 506 return 0; 507 507 } 508 508 509 - static int innolux_panel_remove(struct mipi_dsi_device *dsi) 509 + static void innolux_panel_remove(struct mipi_dsi_device *dsi) 510 510 { 511 511 struct innolux_panel *innolux = mipi_dsi_get_drvdata(dsi); 512 512 int err; ··· 524 524 dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", err); 525 525 526 526 innolux_panel_del(innolux); 527 - 528 - return 0; 529 527 } 530 528 531 529 static void innolux_panel_shutdown(struct mipi_dsi_device *dsi)
+1 -3
drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c
··· 288 288 return 0; 289 289 } 290 290 291 - static int jdi_fhd_r63452_remove(struct mipi_dsi_device *dsi) 291 + static void jdi_fhd_r63452_remove(struct mipi_dsi_device *dsi) 292 292 { 293 293 struct jdi_fhd_r63452 *ctx = mipi_dsi_get_drvdata(dsi); 294 294 int ret; ··· 298 298 dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); 299 299 300 300 drm_panel_remove(&ctx->panel); 301 - 302 - return 0; 303 301 } 304 302 305 303 static const struct of_device_id jdi_fhd_r63452_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
··· 482 482 return 0; 483 483 } 484 484 485 - static int jdi_panel_remove(struct mipi_dsi_device *dsi) 485 + static void jdi_panel_remove(struct mipi_dsi_device *dsi) 486 486 { 487 487 struct jdi_panel *jdi = mipi_dsi_get_drvdata(dsi); 488 488 int ret; ··· 497 497 ret); 498 498 499 499 jdi_panel_del(jdi); 500 - 501 - return 0; 502 500 } 503 501 504 502 static void jdi_panel_shutdown(struct mipi_dsi_device *dsi)
+1 -3
drivers/gpu/drm/panel/panel-khadas-ts050.c
··· 830 830 return err; 831 831 } 832 832 833 - static int khadas_ts050_panel_remove(struct mipi_dsi_device *dsi) 833 + static void khadas_ts050_panel_remove(struct mipi_dsi_device *dsi) 834 834 { 835 835 struct khadas_ts050_panel *khadas_ts050 = mipi_dsi_get_drvdata(dsi); 836 836 int err; ··· 842 842 drm_panel_remove(&khadas_ts050->base); 843 843 drm_panel_disable(&khadas_ts050->base); 844 844 drm_panel_unprepare(&khadas_ts050->base); 845 - 846 - return 0; 847 845 } 848 846 849 847 static void khadas_ts050_panel_shutdown(struct mipi_dsi_device *dsi)
+1 -3
drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c
··· 415 415 return 0; 416 416 } 417 417 418 - static int kingdisplay_panel_remove(struct mipi_dsi_device *dsi) 418 + static void kingdisplay_panel_remove(struct mipi_dsi_device *dsi) 419 419 { 420 420 struct kingdisplay_panel *kingdisplay = mipi_dsi_get_drvdata(dsi); 421 421 int err; ··· 433 433 dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", err); 434 434 435 435 kingdisplay_panel_del(kingdisplay); 436 - 437 - return 0; 438 436 } 439 437 440 438 static void kingdisplay_panel_shutdown(struct mipi_dsi_device *dsi)
+1 -3
drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c
··· 628 628 dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret); 629 629 } 630 630 631 - static int ltk050h3146w_remove(struct mipi_dsi_device *dsi) 631 + static void ltk050h3146w_remove(struct mipi_dsi_device *dsi) 632 632 { 633 633 struct ltk050h3146w *ctx = mipi_dsi_get_drvdata(dsi); 634 634 int ret; ··· 640 640 dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); 641 641 642 642 drm_panel_remove(&ctx->panel); 643 - 644 - return 0; 645 643 } 646 644 647 645 static const struct of_device_id ltk050h3146w_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c
··· 477 477 dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret); 478 478 } 479 479 480 - static int ltk500hd1829_remove(struct mipi_dsi_device *dsi) 480 + static void ltk500hd1829_remove(struct mipi_dsi_device *dsi) 481 481 { 482 482 struct ltk500hd1829 *ctx = mipi_dsi_get_drvdata(dsi); 483 483 int ret; ··· 489 489 dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", ret); 490 490 491 491 drm_panel_remove(&ctx->panel); 492 - 493 - return 0; 494 492 } 495 493 496 494 static const struct of_device_id ltk500hd1829_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c
··· 336 336 drm_panel_disable(&ctx->panel); 337 337 } 338 338 339 - static int mantix_remove(struct mipi_dsi_device *dsi) 339 + static void mantix_remove(struct mipi_dsi_device *dsi) 340 340 { 341 341 struct mantix *ctx = mipi_dsi_get_drvdata(dsi); 342 342 ··· 344 344 345 345 mipi_dsi_detach(dsi); 346 346 drm_panel_remove(&ctx->panel); 347 - 348 - return 0; 349 347 } 350 348 351 349 static const struct of_device_id mantix_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-novatek-nt35510.c
··· 966 966 return 0; 967 967 } 968 968 969 - static int nt35510_remove(struct mipi_dsi_device *dsi) 969 + static void nt35510_remove(struct mipi_dsi_device *dsi) 970 970 { 971 971 struct nt35510 *nt = mipi_dsi_get_drvdata(dsi); 972 972 int ret; ··· 978 978 dev_err(&dsi->dev, "Failed to power off\n"); 979 979 980 980 drm_panel_remove(&nt->panel); 981 - 982 - return 0; 983 981 } 984 982 985 983 /*
+1 -3
drivers/gpu/drm/panel/panel-novatek-nt35560.c
··· 523 523 return 0; 524 524 } 525 525 526 - static int nt35560_remove(struct mipi_dsi_device *dsi) 526 + static void nt35560_remove(struct mipi_dsi_device *dsi) 527 527 { 528 528 struct nt35560 *nt = mipi_dsi_get_drvdata(dsi); 529 529 530 530 mipi_dsi_detach(dsi); 531 531 drm_panel_remove(&nt->panel); 532 - 533 - return 0; 534 532 } 535 533 536 534 static const struct of_device_id nt35560_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-novatek-nt35950.c
··· 620 620 return 0; 621 621 } 622 622 623 - static int nt35950_remove(struct mipi_dsi_device *dsi) 623 + static void nt35950_remove(struct mipi_dsi_device *dsi) 624 624 { 625 625 struct nt35950 *nt = mipi_dsi_get_drvdata(dsi); 626 626 int ret; ··· 639 639 } 640 640 641 641 drm_panel_remove(&nt->panel); 642 - 643 - return 0; 644 642 } 645 643 646 644 static const struct nt35950_panel_mode sharp_ls055d1sx04_modes[] = {
+1 -3
drivers/gpu/drm/panel/panel-novatek-nt36672a.c
··· 669 669 return 0; 670 670 } 671 671 672 - static int nt36672a_panel_remove(struct mipi_dsi_device *dsi) 672 + static void nt36672a_panel_remove(struct mipi_dsi_device *dsi) 673 673 { 674 674 struct nt36672a_panel *pinfo = mipi_dsi_get_drvdata(dsi); 675 675 int err; ··· 687 687 dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", err); 688 688 689 689 drm_panel_remove(&pinfo->base); 690 - 691 - return 0; 692 690 } 693 691 694 692 static void nt36672a_panel_shutdown(struct mipi_dsi_device *dsi)
+1 -3
drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
··· 497 497 return 0; 498 498 } 499 499 500 - static int otm8009a_remove(struct mipi_dsi_device *dsi) 500 + static void otm8009a_remove(struct mipi_dsi_device *dsi) 501 501 { 502 502 struct otm8009a *ctx = mipi_dsi_get_drvdata(dsi); 503 503 504 504 mipi_dsi_detach(dsi); 505 505 drm_panel_remove(&ctx->panel); 506 - 507 - return 0; 508 506 } 509 507 510 508 static const struct of_device_id orisetech_otm8009a_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
··· 206 206 return ret; 207 207 } 208 208 209 - static int osd101t2587_panel_remove(struct mipi_dsi_device *dsi) 209 + static void osd101t2587_panel_remove(struct mipi_dsi_device *dsi) 210 210 { 211 211 struct osd101t2587_panel *osd101t2587 = mipi_dsi_get_drvdata(dsi); 212 212 int ret; ··· 221 221 ret = mipi_dsi_detach(dsi); 222 222 if (ret < 0) 223 223 dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", ret); 224 - 225 - return ret; 226 224 } 227 225 228 226 static void osd101t2587_panel_shutdown(struct mipi_dsi_device *dsi)
+1 -3
drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c
··· 250 250 return 0; 251 251 } 252 252 253 - static int wuxga_nt_panel_remove(struct mipi_dsi_device *dsi) 253 + static void wuxga_nt_panel_remove(struct mipi_dsi_device *dsi) 254 254 { 255 255 struct wuxga_nt_panel *wuxga_nt = mipi_dsi_get_drvdata(dsi); 256 256 int ret; ··· 264 264 dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", ret); 265 265 266 266 wuxga_nt_panel_del(wuxga_nt); 267 - 268 - return 0; 269 267 } 270 268 271 269 static void wuxga_nt_panel_shutdown(struct mipi_dsi_device *dsi)
+1 -3
drivers/gpu/drm/panel/panel-raydium-rm67191.c
··· 616 616 return ret; 617 617 } 618 618 619 - static int rad_panel_remove(struct mipi_dsi_device *dsi) 619 + static void rad_panel_remove(struct mipi_dsi_device *dsi) 620 620 { 621 621 struct rad_panel *rad = mipi_dsi_get_drvdata(dsi); 622 622 struct device *dev = &dsi->dev; ··· 627 627 dev_err(dev, "Failed to detach from host (%d)\n", ret); 628 628 629 629 drm_panel_remove(&rad->panel); 630 - 631 - return 0; 632 630 } 633 631 634 632 static void rad_panel_shutdown(struct mipi_dsi_device *dsi)
+1 -3
drivers/gpu/drm/panel/panel-raydium-rm68200.c
··· 412 412 return 0; 413 413 } 414 414 415 - static int rm68200_remove(struct mipi_dsi_device *dsi) 415 + static void rm68200_remove(struct mipi_dsi_device *dsi) 416 416 { 417 417 struct rm68200 *ctx = mipi_dsi_get_drvdata(dsi); 418 418 419 419 mipi_dsi_detach(dsi); 420 420 drm_panel_remove(&ctx->panel); 421 - 422 - return 0; 423 421 } 424 422 425 423 static const struct of_device_id raydium_rm68200_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-ronbo-rb070d30.c
··· 208 208 return 0; 209 209 } 210 210 211 - static int rb070d30_panel_dsi_remove(struct mipi_dsi_device *dsi) 211 + static void rb070d30_panel_dsi_remove(struct mipi_dsi_device *dsi) 212 212 { 213 213 struct rb070d30_panel *ctx = mipi_dsi_get_drvdata(dsi); 214 214 215 215 mipi_dsi_detach(dsi); 216 216 drm_panel_remove(&ctx->panel); 217 - 218 - return 0; 219 217 } 220 218 221 219 static const struct of_device_id rb070d30_panel_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
··· 212 212 return ret; 213 213 } 214 214 215 - static int s6d16d0_remove(struct mipi_dsi_device *dsi) 215 + static void s6d16d0_remove(struct mipi_dsi_device *dsi) 216 216 { 217 217 struct s6d16d0 *s6 = mipi_dsi_get_drvdata(dsi); 218 218 219 219 mipi_dsi_detach(dsi); 220 220 drm_panel_remove(&s6->panel); 221 - 222 - return 0; 223 221 } 224 222 225 223 static const struct of_device_id s6d16d0_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
··· 747 747 return ret; 748 748 } 749 749 750 - static int s6e3ha2_remove(struct mipi_dsi_device *dsi) 750 + static void s6e3ha2_remove(struct mipi_dsi_device *dsi) 751 751 { 752 752 struct s6e3ha2 *ctx = mipi_dsi_get_drvdata(dsi); 753 753 754 754 mipi_dsi_detach(dsi); 755 755 drm_panel_remove(&ctx->panel); 756 756 backlight_device_unregister(ctx->bl_dev); 757 - 758 - return 0; 759 757 } 760 758 761 759 static const struct of_device_id s6e3ha2_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
··· 488 488 return ret; 489 489 } 490 490 491 - static int s6e63j0x03_remove(struct mipi_dsi_device *dsi) 491 + static void s6e63j0x03_remove(struct mipi_dsi_device *dsi) 492 492 { 493 493 struct s6e63j0x03 *ctx = mipi_dsi_get_drvdata(dsi); 494 494 ··· 496 496 drm_panel_remove(&ctx->panel); 497 497 498 498 backlight_device_unregister(ctx->bl_dev); 499 - 500 - return 0; 501 499 } 502 500 503 501 static const struct of_device_id s6e63j0x03_of_match[] = {
+1 -2
drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c
··· 113 113 return ret; 114 114 } 115 115 116 - static int s6e63m0_dsi_remove(struct mipi_dsi_device *dsi) 116 + static void s6e63m0_dsi_remove(struct mipi_dsi_device *dsi) 117 117 { 118 118 mipi_dsi_detach(dsi); 119 119 s6e63m0_remove(&dsi->dev); 120 - return 0; 121 120 } 122 121 123 122 static const struct of_device_id s6e63m0_dsi_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams452ef01.c
··· 254 254 return 0; 255 255 } 256 256 257 - static int s6e88a0_ams452ef01_remove(struct mipi_dsi_device *dsi) 257 + static void s6e88a0_ams452ef01_remove(struct mipi_dsi_device *dsi) 258 258 { 259 259 struct s6e88a0_ams452ef01 *ctx = mipi_dsi_get_drvdata(dsi); 260 260 int ret; ··· 264 264 dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); 265 265 266 266 drm_panel_remove(&ctx->panel); 267 - 268 - return 0; 269 267 } 270 268 271 269 static const struct of_device_id s6e88a0_ams452ef01_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
··· 1028 1028 return ret; 1029 1029 } 1030 1030 1031 - static int s6e8aa0_remove(struct mipi_dsi_device *dsi) 1031 + static void s6e8aa0_remove(struct mipi_dsi_device *dsi) 1032 1032 { 1033 1033 struct s6e8aa0 *ctx = mipi_dsi_get_drvdata(dsi); 1034 1034 1035 1035 mipi_dsi_detach(dsi); 1036 1036 drm_panel_remove(&ctx->panel); 1037 - 1038 - return 0; 1039 1037 } 1040 1038 1041 1039 static const struct of_device_id s6e8aa0_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-samsung-sofef00.c
··· 305 305 return 0; 306 306 } 307 307 308 - static int sofef00_panel_remove(struct mipi_dsi_device *dsi) 308 + static void sofef00_panel_remove(struct mipi_dsi_device *dsi) 309 309 { 310 310 struct sofef00_panel *ctx = mipi_dsi_get_drvdata(dsi); 311 311 int ret; ··· 315 315 dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); 316 316 317 317 drm_panel_remove(&ctx->panel); 318 - 319 - return 0; 320 318 } 321 319 322 320 static const struct of_device_id sofef00_panel_of_match[] = {
+2 -4
drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c
··· 391 391 return 0; 392 392 } 393 393 394 - static int sharp_panel_remove(struct mipi_dsi_device *dsi) 394 + static void sharp_panel_remove(struct mipi_dsi_device *dsi) 395 395 { 396 396 struct sharp_panel *sharp = mipi_dsi_get_drvdata(dsi); 397 397 int err; ··· 399 399 /* only detach from host for the DSI-LINK2 interface */ 400 400 if (!sharp) { 401 401 mipi_dsi_detach(dsi); 402 - return 0; 402 + return; 403 403 } 404 404 405 405 err = drm_panel_disable(&sharp->base); ··· 411 411 dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", err); 412 412 413 413 sharp_panel_del(sharp); 414 - 415 - return 0; 416 414 } 417 415 418 416 static void sharp_panel_shutdown(struct mipi_dsi_device *dsi)
+1 -3
drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c
··· 305 305 return 0; 306 306 } 307 307 308 - static int sharp_nt_panel_remove(struct mipi_dsi_device *dsi) 308 + static void sharp_nt_panel_remove(struct mipi_dsi_device *dsi) 309 309 { 310 310 struct sharp_nt_panel *sharp_nt = mipi_dsi_get_drvdata(dsi); 311 311 int ret; ··· 319 319 dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", ret); 320 320 321 321 sharp_nt_panel_del(sharp_nt); 322 - 323 - return 0; 324 322 } 325 323 326 324 static void sharp_nt_panel_shutdown(struct mipi_dsi_device *dsi)
+1 -3
drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c
··· 298 298 return 0; 299 299 } 300 300 301 - static int sharp_ls060_remove(struct mipi_dsi_device *dsi) 301 + static void sharp_ls060_remove(struct mipi_dsi_device *dsi) 302 302 { 303 303 struct sharp_ls060 *ctx = mipi_dsi_get_drvdata(dsi); 304 304 int ret; ··· 308 308 dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); 309 309 310 310 drm_panel_remove(&ctx->panel); 311 - 312 - return 0; 313 311 } 314 312 315 313 static const struct of_device_id sharp_ls060t1sx01_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-simple.c
··· 4566 4566 return err; 4567 4567 } 4568 4568 4569 - static int panel_simple_dsi_remove(struct mipi_dsi_device *dsi) 4569 + static void panel_simple_dsi_remove(struct mipi_dsi_device *dsi) 4570 4570 { 4571 4571 int err; 4572 4572 ··· 4575 4575 dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", err); 4576 4576 4577 4577 panel_simple_remove(&dsi->dev); 4578 - 4579 - return 0; 4580 4578 } 4581 4579 4582 4580 static void panel_simple_dsi_shutdown(struct mipi_dsi_device *dsi)
+1 -3
drivers/gpu/drm/panel/panel-sitronix-st7701.c
··· 387 387 return mipi_dsi_attach(dsi); 388 388 } 389 389 390 - static int st7701_dsi_remove(struct mipi_dsi_device *dsi) 390 + static void st7701_dsi_remove(struct mipi_dsi_device *dsi) 391 391 { 392 392 struct st7701 *st7701 = mipi_dsi_get_drvdata(dsi); 393 393 394 394 mipi_dsi_detach(dsi); 395 395 drm_panel_remove(&st7701->panel); 396 - 397 - return 0; 398 396 } 399 397 400 398 static const struct of_device_id st7701_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-sitronix-st7703.c
··· 598 598 dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret); 599 599 } 600 600 601 - static int st7703_remove(struct mipi_dsi_device *dsi) 601 + static void st7703_remove(struct mipi_dsi_device *dsi) 602 602 { 603 603 struct st7703 *ctx = mipi_dsi_get_drvdata(dsi); 604 604 int ret; ··· 612 612 drm_panel_remove(&ctx->panel); 613 613 614 614 st7703_debugfs_remove(ctx); 615 - 616 - return 0; 617 615 } 618 616 619 617 static const struct of_device_id st7703_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c
··· 517 517 return 0; 518 518 } 519 519 520 - static int truly_nt35521_remove(struct mipi_dsi_device *dsi) 520 + static void truly_nt35521_remove(struct mipi_dsi_device *dsi) 521 521 { 522 522 struct truly_nt35521 *ctx = mipi_dsi_get_drvdata(dsi); 523 523 int ret; ··· 527 527 dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); 528 528 529 529 drm_panel_remove(&ctx->panel); 530 - 531 - return 0; 532 530 } 533 531 534 532 static const struct of_device_id truly_nt35521_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c
··· 210 210 return mipi_dsi_attach(dsi); 211 211 } 212 212 213 - static int tdo_tl070wsh30_panel_remove(struct mipi_dsi_device *dsi) 213 + static void tdo_tl070wsh30_panel_remove(struct mipi_dsi_device *dsi) 214 214 { 215 215 struct tdo_tl070wsh30_panel *tdo_tl070wsh30 = mipi_dsi_get_drvdata(dsi); 216 216 int err; ··· 222 222 drm_panel_remove(&tdo_tl070wsh30->base); 223 223 drm_panel_disable(&tdo_tl070wsh30->base); 224 224 drm_panel_unprepare(&tdo_tl070wsh30->base); 225 - 226 - return 0; 227 225 } 228 226 229 227 static void tdo_tl070wsh30_panel_shutdown(struct mipi_dsi_device *dsi)
+1 -2
drivers/gpu/drm/panel/panel-truly-nt35597.c
··· 616 616 return ret; 617 617 } 618 618 619 - static int truly_nt35597_remove(struct mipi_dsi_device *dsi) 619 + static void truly_nt35597_remove(struct mipi_dsi_device *dsi) 620 620 { 621 621 struct truly_nt35597 *ctx = mipi_dsi_get_drvdata(dsi); 622 622 ··· 628 628 } 629 629 630 630 drm_panel_remove(&ctx->panel); 631 - return 0; 632 631 } 633 632 634 633 static const struct of_device_id truly_nt35597_of_match[] = {
+1 -2
drivers/gpu/drm/panel/panel-visionox-rm69299.c
··· 256 256 return ret; 257 257 } 258 258 259 - static int visionox_rm69299_remove(struct mipi_dsi_device *dsi) 259 + static void visionox_rm69299_remove(struct mipi_dsi_device *dsi) 260 260 { 261 261 struct visionox_rm69299 *ctx = mipi_dsi_get_drvdata(dsi); 262 262 ··· 264 264 mipi_dsi_device_unregister(ctx->dsi); 265 265 266 266 drm_panel_remove(&ctx->panel); 267 - return 0; 268 267 } 269 268 270 269 static const struct of_device_id visionox_rm69299_of_match[] = {
+1 -3
drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c
··· 339 339 dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret); 340 340 } 341 341 342 - static int xpp055c272_remove(struct mipi_dsi_device *dsi) 342 + static void xpp055c272_remove(struct mipi_dsi_device *dsi) 343 343 { 344 344 struct xpp055c272 *ctx = mipi_dsi_get_drvdata(dsi); 345 345 int ret; ··· 351 351 dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); 352 352 353 353 drm_panel_remove(&ctx->panel); 354 - 355 - return 0; 356 354 } 357 355 358 356 static const struct of_device_id xpp055c272_of_match[] = {
+1 -1
include/drm/drm_mipi_dsi.h
··· 322 322 struct mipi_dsi_driver { 323 323 struct device_driver driver; 324 324 int(*probe)(struct mipi_dsi_device *dsi); 325 - int(*remove)(struct mipi_dsi_device *dsi); 325 + void (*remove)(struct mipi_dsi_device *dsi); 326 326 void (*shutdown)(struct mipi_dsi_device *dsi); 327 327 }; 328 328