mirror of
https://github.com/ukui/kernel.git
synced 2026-03-09 10:07:04 -07:00
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
This commit is contained in:
committed by
Sam Ravnborg
parent
1fd452c403
commit
79abca2b39
@@ -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[] = {
|
||||
|
||||
@@ -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[] = {
|
||||
|
||||
@@ -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[] = {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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[] = {
|
||||
|
||||
@@ -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[] = {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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[] = {
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -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[] = {
|
||||
|
||||
@@ -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[] = {
|
||||
|
||||
@@ -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[] = {
|
||||
|
||||
@@ -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[] = {
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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[] = {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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[] = {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user