openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/sti: remove use of drm_debugfs functions as return values 

Since commit 987d65d013 (drm: debugfs: make
drm_debugfs_create_files() never fail), drm_debugfs_create_files() never
fails, and should return void. This change therefore removes it uses as
a return value in various functions across drm/sti.

With these changes, the affected functions have been changed to use a void
return value.

v2: convert sti_mixer_debugfs_init() and sti_compositor_debugfs_init()
to return void too. Also have sti_drm_dbg_init() to return 0 to avoid
build issues.

References: https://lists.freedesktop.org/archives/dri-devel/2020-February/257183.html
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200310133121.27913-10-wambui.karugax@gmail.com
This commit is contained in:
Wambui Karuga 2020-03-10 16:31:13 +03:00 committed by Daniel Vetter
parent 9e2fd463ec
commit 54ac836b16
15 changed files with 58 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/sti/sti_compositor.c
View File

@ -42,7 +42,7 @@ static const struct sti_compositor_data stih407_compositor_data = {
}, },
}; };
int sti_compositor_debugfs_init(struct sti_compositor *compo, void sti_compositor_debugfs_init(struct sti_compositor *compo,
struct drm_minor *minor) struct drm_minor *minor)
{ {
unsigned int i; unsigned int i;
@ -54,8 +54,6 @@ int sti_compositor_debugfs_init(struct sti_compositor *compo,
for (i = 0; i < STI_MAX_MIXER; i++) for (i = 0; i < STI_MAX_MIXER; i++)
if (compo->mixer[i]) if (compo->mixer[i])
sti_mixer_debugfs_init(compo->mixer[i], minor); sti_mixer_debugfs_init(compo->mixer[i], minor);
return 0;
} }
static int sti_compositor_bind(struct device *dev, static int sti_compositor_bind(struct device *dev,

2
drivers/gpu/drm/sti/sti_compositor.h
View File

@ -79,7 +79,7 @@ struct sti_compositor {
struct notifier_block vtg_vblank_nb[STI_MAX_MIXER]; struct notifier_block vtg_vblank_nb[STI_MAX_MIXER];
}; };
int sti_compositor_debugfs_init(struct sti_compositor *compo, void sti_compositor_debugfs_init(struct sti_compositor *compo,
struct drm_minor *minor); struct drm_minor *minor);
#endif #endif

2
drivers/gpu/drm/sti/sti_crtc.c
View File

@ -319,7 +319,7 @@ static int sti_crtc_late_register(struct drm_crtc *crtc)
struct sti_compositor *compo = dev_get_drvdata(mixer->dev); struct sti_compositor *compo = dev_get_drvdata(mixer->dev);
if (drm_crtc_index(crtc) == 0) if (drm_crtc_index(crtc) == 0)
return sti_compositor_debugfs_init(compo, crtc->dev->primary); sti_compositor_debugfs_init(compo, crtc->dev->primary);
return 0; return 0;
} }

8
drivers/gpu/drm/sti/sti_cursor.c
View File

@ -131,7 +131,7 @@ static struct drm_info_list cursor_debugfs_files[] = {
{ "cursor", cursor_dbg_show, 0, NULL }, { "cursor", cursor_dbg_show, 0, NULL },
}; };
static int cursor_debugfs_init(struct sti_cursor *cursor, static void cursor_debugfs_init(struct sti_cursor *cursor,
struct drm_minor *minor) struct drm_minor *minor)
{ {
unsigned int i; unsigned int i;
@ -139,7 +139,7 @@ static int cursor_debugfs_init(struct sti_cursor *cursor,
for (i = 0; i < ARRAY_SIZE(cursor_debugfs_files); i++) for (i = 0; i < ARRAY_SIZE(cursor_debugfs_files); i++)
cursor_debugfs_files[i].data = cursor; cursor_debugfs_files[i].data = cursor;
return drm_debugfs_create_files(cursor_debugfs_files, drm_debugfs_create_files(cursor_debugfs_files,
ARRAY_SIZE(cursor_debugfs_files), ARRAY_SIZE(cursor_debugfs_files),
minor->debugfs_root, minor); minor->debugfs_root, minor);
} }
@ -342,7 +342,9 @@ static int sti_cursor_late_register(struct drm_plane *drm_plane)
struct sti_plane *plane = to_sti_plane(drm_plane); struct sti_plane *plane = to_sti_plane(drm_plane);
struct sti_cursor *cursor = to_sti_cursor(plane); struct sti_cursor *cursor = to_sti_cursor(plane);
return cursor_debugfs_init(cursor, drm_plane->dev->primary); cursor_debugfs_init(cursor, drm_plane->dev->primary);
return 0;
} }
static const struct drm_plane_funcs sti_cursor_plane_helpers_funcs = { static const struct drm_plane_funcs sti_cursor_plane_helpers_funcs = {

9
drivers/gpu/drm/sti/sti_drv.c
View File

@ -94,22 +94,15 @@ static struct drm_info_list sti_drm_dbg_list[] = {
static int sti_drm_dbg_init(struct drm_minor *minor) static int sti_drm_dbg_init(struct drm_minor *minor)
{ {
int ret; drm_debugfs_create_files(sti_drm_dbg_list,
ret = drm_debugfs_create_files(sti_drm_dbg_list,
ARRAY_SIZE(sti_drm_dbg_list), ARRAY_SIZE(sti_drm_dbg_list),
minor->debugfs_root, minor); minor->debugfs_root, minor);
if (ret)
goto err;
debugfs_create_file("fps_show", S_IRUGO | S_IWUSR, minor->debugfs_root, debugfs_create_file("fps_show", S_IRUGO | S_IWUSR, minor->debugfs_root,
minor->dev, &sti_drm_fps_fops); minor->dev, &sti_drm_fps_fops);
DRM_INFO("%s: debugfs installed\n", DRIVER_NAME); DRM_INFO("%s: debugfs installed\n", DRIVER_NAME);
return 0; return 0;
err:
DRM_ERROR("%s: cannot install debugfs\n", DRIVER_NAME);
return ret;
} }
static const struct drm_mode_config_funcs sti_mode_config_funcs = { static const struct drm_mode_config_funcs sti_mode_config_funcs = {

9
drivers/gpu/drm/sti/sti_dvo.c
View File

@ -196,14 +196,14 @@ static struct drm_info_list dvo_debugfs_files[] = {
{ "dvo", dvo_dbg_show, 0, NULL }, { "dvo", dvo_dbg_show, 0, NULL },
}; };
static int dvo_debugfs_init(struct sti_dvo *dvo, struct drm_minor *minor) static void dvo_debugfs_init(struct sti_dvo *dvo, struct drm_minor *minor)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(dvo_debugfs_files); i++) for (i = 0; i < ARRAY_SIZE(dvo_debugfs_files); i++)
dvo_debugfs_files[i].data = dvo; dvo_debugfs_files[i].data = dvo;
return drm_debugfs_create_files(dvo_debugfs_files, drm_debugfs_create_files(dvo_debugfs_files,
ARRAY_SIZE(dvo_debugfs_files), ARRAY_SIZE(dvo_debugfs_files),
minor->debugfs_root, minor); minor->debugfs_root, minor);
} }
@ -405,10 +405,7 @@ static int sti_dvo_late_register(struct drm_connector *connector)
= to_sti_dvo_connector(connector); = to_sti_dvo_connector(connector);
struct sti_dvo *dvo = dvo_connector->dvo; struct sti_dvo *dvo = dvo_connector->dvo;
if (dvo_debugfs_init(dvo, dvo->drm_dev->primary)) { dvo_debugfs_init(dvo, dvo->drm_dev->primary);
DRM_ERROR("DVO debugfs setup failed\n");
return -EINVAL;
}
return 0; return 0;
} }

3
drivers/gpu/drm/sti/sti_gdp.c
View File

@ -343,9 +343,10 @@ static int gdp_debugfs_init(struct sti_gdp *gdp, struct drm_minor *minor)
for (i = 0; i < nb_files; i++) for (i = 0; i < nb_files; i++)
gdp_debugfs_files[i].data = gdp; gdp_debugfs_files[i].data = gdp;
return drm_debugfs_create_files(gdp_debugfs_files, drm_debugfs_create_files(gdp_debugfs_files,
nb_files, nb_files,
minor->debugfs_root, minor); minor->debugfs_root, minor);
return 0;
} }
static int sti_gdp_fourcc2format(int fourcc) static int sti_gdp_fourcc2format(int fourcc)

9
drivers/gpu/drm/sti/sti_hda.c
View File

@ -367,14 +367,14 @@ static struct drm_info_list hda_debugfs_files[] = {
{ "hda", hda_dbg_show, 0, NULL }, { "hda", hda_dbg_show, 0, NULL },
}; };
static int hda_debugfs_init(struct sti_hda *hda, struct drm_minor *minor) static void hda_debugfs_init(struct sti_hda *hda, struct drm_minor *minor)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(hda_debugfs_files); i++) for (i = 0; i < ARRAY_SIZE(hda_debugfs_files); i++)
hda_debugfs_files[i].data = hda; hda_debugfs_files[i].data = hda;
return drm_debugfs_create_files(hda_debugfs_files, drm_debugfs_create_files(hda_debugfs_files,
ARRAY_SIZE(hda_debugfs_files), ARRAY_SIZE(hda_debugfs_files),
minor->debugfs_root, minor); minor->debugfs_root, minor);
} }
@ -643,10 +643,7 @@ static int sti_hda_late_register(struct drm_connector *connector)
= to_sti_hda_connector(connector); = to_sti_hda_connector(connector);
struct sti_hda *hda = hda_connector->hda; struct sti_hda *hda = hda_connector->hda;
if (hda_debugfs_init(hda, hda->drm_dev->primary)) { hda_debugfs_init(hda, hda->drm_dev->primary);
DRM_ERROR("HDA debugfs setup failed\n");
return -EINVAL;
}
return 0; return 0;
} }

9
drivers/gpu/drm/sti/sti_hdmi.c
View File

@ -727,14 +727,14 @@ static struct drm_info_list hdmi_debugfs_files[] = {
{ "hdmi", hdmi_dbg_show, 0, NULL }, { "hdmi", hdmi_dbg_show, 0, NULL },
}; };
static int hdmi_debugfs_init(struct sti_hdmi *hdmi, struct drm_minor *minor) static void hdmi_debugfs_init(struct sti_hdmi *hdmi, struct drm_minor *minor)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(hdmi_debugfs_files); i++) for (i = 0; i < ARRAY_SIZE(hdmi_debugfs_files); i++)
hdmi_debugfs_files[i].data = hdmi; hdmi_debugfs_files[i].data = hdmi;
return drm_debugfs_create_files(hdmi_debugfs_files, drm_debugfs_create_files(hdmi_debugfs_files,
ARRAY_SIZE(hdmi_debugfs_files), ARRAY_SIZE(hdmi_debugfs_files),
minor->debugfs_root, minor); minor->debugfs_root, minor);
} }
@ -1113,10 +1113,7 @@ static int sti_hdmi_late_register(struct drm_connector *connector)
= to_sti_hdmi_connector(connector); = to_sti_hdmi_connector(connector);
struct sti_hdmi *hdmi = hdmi_connector->hdmi; struct sti_hdmi *hdmi = hdmi_connector->hdmi;
if (hdmi_debugfs_init(hdmi, hdmi->drm_dev->primary)) { hdmi_debugfs_init(hdmi, hdmi->drm_dev->primary);
DRM_ERROR("HDMI debugfs setup failed\n");
return -EINVAL;
}
return 0; return 0;
} }

8
drivers/gpu/drm/sti/sti_hqvdp.c
View File

@ -639,14 +639,14 @@ static struct drm_info_list hqvdp_debugfs_files[] = {
{ "hqvdp", hqvdp_dbg_show, 0, NULL }, { "hqvdp", hqvdp_dbg_show, 0, NULL },
}; };
static int hqvdp_debugfs_init(struct sti_hqvdp *hqvdp, struct drm_minor *minor) static void hqvdp_debugfs_init(struct sti_hqvdp *hqvdp, struct drm_minor *minor)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(hqvdp_debugfs_files); i++) for (i = 0; i < ARRAY_SIZE(hqvdp_debugfs_files); i++)
hqvdp_debugfs_files[i].data = hqvdp; hqvdp_debugfs_files[i].data = hqvdp;
return drm_debugfs_create_files(hqvdp_debugfs_files, drm_debugfs_create_files(hqvdp_debugfs_files,
ARRAY_SIZE(hqvdp_debugfs_files), ARRAY_SIZE(hqvdp_debugfs_files),
minor->debugfs_root, minor); minor->debugfs_root, minor);
} }
@ -1274,7 +1274,9 @@ static int sti_hqvdp_late_register(struct drm_plane *drm_plane)
struct sti_plane *plane = to_sti_plane(drm_plane); struct sti_plane *plane = to_sti_plane(drm_plane);
struct sti_hqvdp *hqvdp = to_sti_hqvdp(plane); struct sti_hqvdp *hqvdp = to_sti_hqvdp(plane);
return hqvdp_debugfs_init(hqvdp, drm_plane->dev->primary); hqvdp_debugfs_init(hqvdp, drm_plane->dev->primary);
return 0;
} }
static const struct drm_plane_funcs sti_hqvdp_plane_helpers_funcs = { static const struct drm_plane_funcs sti_hqvdp_plane_helpers_funcs = {

6
drivers/gpu/drm/sti/sti_mixer.c
View File

@ -178,7 +178,7 @@ static struct drm_info_list mixer1_debugfs_files[] = {
{ "mixer_aux", mixer_dbg_show, 0, NULL }, { "mixer_aux", mixer_dbg_show, 0, NULL },
}; };
int sti_mixer_debugfs_init(struct sti_mixer *mixer, struct drm_minor *minor) void sti_mixer_debugfs_init(struct sti_mixer *mixer, struct drm_minor *minor)
{ {
unsigned int i; unsigned int i;
struct drm_info_list *mixer_debugfs_files; struct drm_info_list *mixer_debugfs_files;
@ -194,13 +194,13 @@ int sti_mixer_debugfs_init(struct sti_mixer *mixer, struct drm_minor *minor)
nb_files = ARRAY_SIZE(mixer1_debugfs_files); nb_files = ARRAY_SIZE(mixer1_debugfs_files);
break; break;
default: default:
return -EINVAL; return;
} }
for (i = 0; i < nb_files; i++) for (i = 0; i < nb_files; i++)
mixer_debugfs_files[i].data = mixer; mixer_debugfs_files[i].data = mixer;
return drm_debugfs_create_files(mixer_debugfs_files, drm_debugfs_create_files(mixer_debugfs_files,
nb_files, nb_files,
minor->debugfs_root, minor); minor->debugfs_root, minor);
} }

2
drivers/gpu/drm/sti/sti_mixer.h
View File

@ -58,7 +58,7 @@ int sti_mixer_active_video_area(struct sti_mixer *mixer,
void sti_mixer_set_background_status(struct sti_mixer *mixer, bool enable); void sti_mixer_set_background_status(struct sti_mixer *mixer, bool enable);
int sti_mixer_debugfs_init(struct sti_mixer *mixer, struct drm_minor *minor); void sti_mixer_debugfs_init(struct sti_mixer *mixer, struct drm_minor *minor);
/* depth in Cross-bar control = z order */ /* depth in Cross-bar control = z order */
#define GAM_MIXER_NB_DEPTH_LEVEL 6 #define GAM_MIXER_NB_DEPTH_LEVEL 6

9
drivers/gpu/drm/sti/sti_tvout.c
View File

@ -570,14 +570,14 @@ static struct drm_info_list tvout_debugfs_files[] = {
{ "tvout", tvout_dbg_show, 0, NULL }, { "tvout", tvout_dbg_show, 0, NULL },
}; };
static int tvout_debugfs_init(struct sti_tvout *tvout, struct drm_minor *minor) static void tvout_debugfs_init(struct sti_tvout *tvout, struct drm_minor *minor)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(tvout_debugfs_files); i++) for (i = 0; i < ARRAY_SIZE(tvout_debugfs_files); i++)
tvout_debugfs_files[i].data = tvout; tvout_debugfs_files[i].data = tvout;
return drm_debugfs_create_files(tvout_debugfs_files, drm_debugfs_create_files(tvout_debugfs_files,
ARRAY_SIZE(tvout_debugfs_files), ARRAY_SIZE(tvout_debugfs_files),
minor->debugfs_root, minor); minor->debugfs_root, minor);
} }
@ -603,14 +603,11 @@ static void sti_tvout_encoder_destroy(struct drm_encoder *encoder)
static int sti_tvout_late_register(struct drm_encoder *encoder) static int sti_tvout_late_register(struct drm_encoder *encoder)
{ {
struct sti_tvout *tvout = to_sti_tvout(encoder); struct sti_tvout *tvout = to_sti_tvout(encoder);
int ret;
if (tvout->debugfs_registered) if (tvout->debugfs_registered)
return 0; return 0;
ret = tvout_debugfs_init(tvout, encoder->dev->primary); tvout_debugfs_init(tvout, encoder->dev->primary);
if (ret)
return ret;
tvout->debugfs_registered = true; tvout->debugfs_registered = true;
return 0; return 0;

4
drivers/gpu/drm/sti/sti_vid.c
View File

@ -124,14 +124,14 @@ static struct drm_info_list vid_debugfs_files[] = {
{ "vid", vid_dbg_show, 0, NULL }, { "vid", vid_dbg_show, 0, NULL },
}; };
int vid_debugfs_init(struct sti_vid *vid, struct drm_minor *minor) void vid_debugfs_init(struct sti_vid *vid, struct drm_minor *minor)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(vid_debugfs_files); i++) for (i = 0; i < ARRAY_SIZE(vid_debugfs_files); i++)
vid_debugfs_files[i].data = vid; vid_debugfs_files[i].data = vid;
return drm_debugfs_create_files(vid_debugfs_files, drm_debugfs_create_files(vid_debugfs_files,
ARRAY_SIZE(vid_debugfs_files), ARRAY_SIZE(vid_debugfs_files),
minor->debugfs_root, minor); minor->debugfs_root, minor);
} }

2
drivers/gpu/drm/sti/sti_vid.h
View File

@ -26,6 +26,6 @@ void sti_vid_disable(struct sti_vid *vid);
struct sti_vid *sti_vid_create(struct device *dev, struct drm_device *drm_dev, struct sti_vid *sti_vid_create(struct device *dev, struct drm_device *drm_dev,
int id, void __iomem *baseaddr); int id, void __iomem *baseaddr);
int vid_debugfs_init(struct sti_vid *vid, struct drm_minor *minor); void vid_debugfs_init(struct sti_vid *vid, struct drm_minor *minor);
#endif #endif