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

Since commit 987d65d01356 (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

diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c
index c7652584255d3762387a856c0e807b8f3b80b5fb..319962a2c17bf6090c62550301ab420c8d5f9264 100644 (file)
--- a/drivers/gpu/drm/sti/sti_compositor.c
+++ b/drivers/gpu/drm/sti/sti_compositor.c
@@ -42,8 +42,8 @@ static const struct sti_compositor_data stih407_compositor_data = {
        },
 };
 
-int sti_compositor_debugfs_init(struct sti_compositor *compo,
-                               struct drm_minor *minor)
+void sti_compositor_debugfs_init(struct sti_compositor *compo,
+                                struct drm_minor *minor)
 {
        unsigned int i;
 
@@ -54,8 +54,6 @@ int sti_compositor_debugfs_init(struct sti_compositor *compo,
        for (i = 0; i < STI_MAX_MIXER; i++)
                if (compo->mixer[i])
                        sti_mixer_debugfs_init(compo->mixer[i], minor);
-
-       return 0;
 }
 
 static int sti_compositor_bind(struct device *dev,

diff --git a/drivers/gpu/drm/sti/sti_compositor.h b/drivers/gpu/drm/sti/sti_compositor.h
index ac4bb38348102e597613d5f80e02cd4e16e9b825..25bb01bdd013f897faa4ffd151d3522fc362587b 100644 (file)
--- a/drivers/gpu/drm/sti/sti_compositor.h
+++ b/drivers/gpu/drm/sti/sti_compositor.h
@@ -79,7 +79,7 @@ struct sti_compositor {
        struct notifier_block vtg_vblank_nb[STI_MAX_MIXER];
 };
 
-int sti_compositor_debugfs_init(struct sti_compositor *compo,
-                               struct drm_minor *minor);
+void sti_compositor_debugfs_init(struct sti_compositor *compo,
+                                struct drm_minor *minor);
 
 #endif

diff --git a/drivers/gpu/drm/sti/sti_crtc.c b/drivers/gpu/drm/sti/sti_crtc.c
index 49e6cb8f58367ee198d4a2e9146be0ac4b31b259..6f37c104c46f909f057b10df0a47dc561b868636 100644 (file)
--- a/drivers/gpu/drm/sti/sti_crtc.c
+++ b/drivers/gpu/drm/sti/sti_crtc.c
@@ -319,7 +319,7 @@ static int sti_crtc_late_register(struct drm_crtc *crtc)
        struct sti_compositor *compo = dev_get_drvdata(mixer->dev);
 
        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;
 }

diff --git a/drivers/gpu/drm/sti/sti_cursor.c b/drivers/gpu/drm/sti/sti_cursor.c
index ea64c1dcaf634042a41e3bef1162eda03630c521..a9805743102375bb55696c33dc2fa8f317b618f6 100644 (file)
--- a/drivers/gpu/drm/sti/sti_cursor.c
+++ b/drivers/gpu/drm/sti/sti_cursor.c
@@ -131,17 +131,17 @@ static struct drm_info_list cursor_debugfs_files[] = {
        { "cursor", cursor_dbg_show, 0, NULL },
 };
 
-static int cursor_debugfs_init(struct sti_cursor *cursor,
-                              struct drm_minor *minor)
+static void cursor_debugfs_init(struct sti_cursor *cursor,
+                               struct drm_minor *minor)
 {
        unsigned int i;
 
        for (i = 0; i < ARRAY_SIZE(cursor_debugfs_files); i++)
                cursor_debugfs_files[i].data = cursor;
 
-       return drm_debugfs_create_files(cursor_debugfs_files,
-                                       ARRAY_SIZE(cursor_debugfs_files),
-                                       minor->debugfs_root, minor);
+       drm_debugfs_create_files(cursor_debugfs_files,
+                                ARRAY_SIZE(cursor_debugfs_files),
+                                minor->debugfs_root, minor);
 }
 
 static void sti_cursor_argb8888_to_clut8(struct sti_cursor *cursor, u32 *src)
@@ -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_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 = {

diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
index 50870d8cbb76739bcee4d9b5ea867fc7b0f2401a..5ab36f6001fcf3777d9a22f855be822e1be4fc1b 100644 (file)
--- a/drivers/gpu/drm/sti/sti_drv.c
+++ b/drivers/gpu/drm/sti/sti_drv.c
@@ -94,22 +94,15 @@ static struct drm_info_list sti_drm_dbg_list[] = {
 
 static int sti_drm_dbg_init(struct drm_minor *minor)
 {
-       int ret;
-
-       ret = drm_debugfs_create_files(sti_drm_dbg_list,
-                                      ARRAY_SIZE(sti_drm_dbg_list),
-                                      minor->debugfs_root, minor);
-       if (ret)
-               goto err;
+       drm_debugfs_create_files(sti_drm_dbg_list,
+                                ARRAY_SIZE(sti_drm_dbg_list),
+                                minor->debugfs_root, minor);
 
        debugfs_create_file("fps_show", S_IRUGO | S_IWUSR, minor->debugfs_root,
                            minor->dev, &sti_drm_fps_fops);
 
        DRM_INFO("%s: debugfs installed\n", DRIVER_NAME);
        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 = {

diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
index 3d04bfca21a06232d6fe5ff54a35a0f4d4c4fab3..de4af7735c469c8620acd803866c2d4cc7451fe2 100644 (file)
--- a/drivers/gpu/drm/sti/sti_dvo.c
+++ b/drivers/gpu/drm/sti/sti_dvo.c
@@ -196,16 +196,16 @@ static struct drm_info_list dvo_debugfs_files[] = {
        { "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;
 
        for (i = 0; i < ARRAY_SIZE(dvo_debugfs_files); i++)
                dvo_debugfs_files[i].data = dvo;
 
-       return drm_debugfs_create_files(dvo_debugfs_files,
-                                       ARRAY_SIZE(dvo_debugfs_files),
-                                       minor->debugfs_root, minor);
+       drm_debugfs_create_files(dvo_debugfs_files,
+                                ARRAY_SIZE(dvo_debugfs_files),
+                                minor->debugfs_root, minor);
 }
 
 static void sti_dvo_disable(struct drm_bridge *bridge)
@@ -405,10 +405,7 @@ static int sti_dvo_late_register(struct drm_connector *connector)
                = to_sti_dvo_connector(connector);
        struct sti_dvo *dvo = dvo_connector->dvo;
 
-       if (dvo_debugfs_init(dvo, dvo->drm_dev->primary)) {
-               DRM_ERROR("DVO debugfs setup failed\n");
-               return -EINVAL;
-       }
+       dvo_debugfs_init(dvo, dvo->drm_dev->primary);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/sti/sti_gdp.c b/drivers/gpu/drm/sti/sti_gdp.c
index 11595c748844f6f0a088f698b4c4cf0011142bf7..2d5a2b5b78b8e5dd5f202dbb009b09c1615e8ef4 100644 (file)
--- a/drivers/gpu/drm/sti/sti_gdp.c
+++ b/drivers/gpu/drm/sti/sti_gdp.c
@@ -343,9 +343,10 @@ static int gdp_debugfs_init(struct sti_gdp *gdp, struct drm_minor *minor)
        for (i = 0; i < nb_files; i++)
                gdp_debugfs_files[i].data = gdp;
 
-       return drm_debugfs_create_files(gdp_debugfs_files,
-                                       nb_files,
-                                       minor->debugfs_root, minor);
+       drm_debugfs_create_files(gdp_debugfs_files,
+                                nb_files,
+                                minor->debugfs_root, minor);
+       return 0;
 }
 
 static int sti_gdp_fourcc2format(int fourcc)

diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c
index f3f28d79b0e40ea3a22685351f67022c1e060e36..a1ec891eaf3aaad720b6ddd797b14892753224a4 100644 (file)
--- a/drivers/gpu/drm/sti/sti_hda.c
+++ b/drivers/gpu/drm/sti/sti_hda.c
@@ -367,16 +367,16 @@ static struct drm_info_list hda_debugfs_files[] = {
        { "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;
 
        for (i = 0; i < ARRAY_SIZE(hda_debugfs_files); i++)
                hda_debugfs_files[i].data = hda;
 
-       return drm_debugfs_create_files(hda_debugfs_files,
-                                       ARRAY_SIZE(hda_debugfs_files),
-                                       minor->debugfs_root, minor);
+       drm_debugfs_create_files(hda_debugfs_files,
+                                ARRAY_SIZE(hda_debugfs_files),
+                                minor->debugfs_root, minor);
 }
 
 /**
@@ -643,10 +643,7 @@ static int sti_hda_late_register(struct drm_connector *connector)
                = to_sti_hda_connector(connector);
        struct sti_hda *hda = hda_connector->hda;
 
-       if (hda_debugfs_init(hda, hda->drm_dev->primary)) {
-               DRM_ERROR("HDA debugfs setup failed\n");
-               return -EINVAL;
-       }
+       hda_debugfs_init(hda, hda->drm_dev->primary);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 18eaf786ffa46640060e447adc80e8fb90131c5e..5b15c4974e6b5235fd1e32bc0cc7b46ee492e891 100644 (file)
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -727,16 +727,16 @@ static struct drm_info_list hdmi_debugfs_files[] = {
        { "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;
 
        for (i = 0; i < ARRAY_SIZE(hdmi_debugfs_files); i++)
                hdmi_debugfs_files[i].data = hdmi;
 
-       return drm_debugfs_create_files(hdmi_debugfs_files,
-                                       ARRAY_SIZE(hdmi_debugfs_files),
-                                       minor->debugfs_root, minor);
+       drm_debugfs_create_files(hdmi_debugfs_files,
+                                ARRAY_SIZE(hdmi_debugfs_files),
+                                minor->debugfs_root, minor);
 }
 
 static void sti_hdmi_disable(struct drm_bridge *bridge)
@@ -1113,10 +1113,7 @@ static int sti_hdmi_late_register(struct drm_connector *connector)
                = to_sti_hdmi_connector(connector);
        struct sti_hdmi *hdmi = hdmi_connector->hdmi;
 
-       if (hdmi_debugfs_init(hdmi, hdmi->drm_dev->primary)) {
-               DRM_ERROR("HDMI debugfs setup failed\n");
-               return -EINVAL;
-       }
+       hdmi_debugfs_init(hdmi, hdmi->drm_dev->primary);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c
index 1015abe0ce086f8bf489ba76d7e203d402890e49..5a4e12194a77dbef4c2958d2e55fd261546ed2c1 100644 (file)
--- a/drivers/gpu/drm/sti/sti_hqvdp.c
+++ b/drivers/gpu/drm/sti/sti_hqvdp.c
@@ -639,16 +639,16 @@ static struct drm_info_list hqvdp_debugfs_files[] = {
        { "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;
 
        for (i = 0; i < ARRAY_SIZE(hqvdp_debugfs_files); i++)
                hqvdp_debugfs_files[i].data = hqvdp;
 
-       return drm_debugfs_create_files(hqvdp_debugfs_files,
-                                       ARRAY_SIZE(hqvdp_debugfs_files),
-                                       minor->debugfs_root, minor);
+       drm_debugfs_create_files(hqvdp_debugfs_files,
+                                ARRAY_SIZE(hqvdp_debugfs_files),
+                                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_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 = {

diff --git a/drivers/gpu/drm/sti/sti_mixer.c b/drivers/gpu/drm/sti/sti_mixer.c
index c3a3e1e5fc8ab8317df27fbb5bcf4ea110a55098..7e5f14646625b437a28b94c4a173ed7dc9ee9d23 100644 (file)
--- a/drivers/gpu/drm/sti/sti_mixer.c
+++ b/drivers/gpu/drm/sti/sti_mixer.c
@@ -178,7 +178,7 @@ static struct drm_info_list mixer1_debugfs_files[] = {
        { "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;
        struct drm_info_list *mixer_debugfs_files;
@@ -194,15 +194,15 @@ int sti_mixer_debugfs_init(struct sti_mixer *mixer, struct drm_minor *minor)
                nb_files = ARRAY_SIZE(mixer1_debugfs_files);
                break;
        default:
-               return -EINVAL;
+               return;
        }
 
        for (i = 0; i < nb_files; i++)
                mixer_debugfs_files[i].data = mixer;
 
-       return drm_debugfs_create_files(mixer_debugfs_files,
-                                       nb_files,
-                                       minor->debugfs_root, minor);
+       drm_debugfs_create_files(mixer_debugfs_files,
+                                nb_files,
+                                minor->debugfs_root, minor);
 }
 
 void sti_mixer_set_background_status(struct sti_mixer *mixer, bool enable)

diff --git a/drivers/gpu/drm/sti/sti_mixer.h b/drivers/gpu/drm/sti/sti_mixer.h
index d9544246913a107da24f5abff1c0fb9e3a1409e4..ab06beb7b25843b6df6ea333ad3220bb5d5c0213 100644 (file)
--- a/drivers/gpu/drm/sti/sti_mixer.h
+++ b/drivers/gpu/drm/sti/sti_mixer.h
@@ -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);
 
-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 */
 #define GAM_MIXER_NB_DEPTH_LEVEL 6

diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c
index c36a8da373cb5d81b0269d31a1295f07b2b83bbb..df3817f0fd30231d3a4d3789e36e297775b7a025 100644 (file)
--- a/drivers/gpu/drm/sti/sti_tvout.c
+++ b/drivers/gpu/drm/sti/sti_tvout.c
@@ -570,16 +570,16 @@ static struct drm_info_list tvout_debugfs_files[] = {
        { "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;
 
        for (i = 0; i < ARRAY_SIZE(tvout_debugfs_files); i++)
                tvout_debugfs_files[i].data = tvout;
 
-       return drm_debugfs_create_files(tvout_debugfs_files,
-                                       ARRAY_SIZE(tvout_debugfs_files),
-                                       minor->debugfs_root, minor);
+       drm_debugfs_create_files(tvout_debugfs_files,
+                                ARRAY_SIZE(tvout_debugfs_files),
+                                minor->debugfs_root, minor);
 }
 
 static void sti_tvout_encoder_dpms(struct drm_encoder *encoder, int mode)
@@ -603,14 +603,11 @@ static void sti_tvout_encoder_destroy(struct drm_encoder *encoder)
 static int sti_tvout_late_register(struct drm_encoder *encoder)
 {
        struct sti_tvout *tvout = to_sti_tvout(encoder);
-       int ret;
 
        if (tvout->debugfs_registered)
                return 0;
 
-       ret = tvout_debugfs_init(tvout, encoder->dev->primary);
-       if (ret)
-               return ret;
+       tvout_debugfs_init(tvout, encoder->dev->primary);
 
        tvout->debugfs_registered = true;
        return 0;

diff --git a/drivers/gpu/drm/sti/sti_vid.c b/drivers/gpu/drm/sti/sti_vid.c
index 2d4230410464471fe615f29b4155976c3222d1f7..2d818397918db832ccacd76dab86fdd54563a737 100644 (file)
--- a/drivers/gpu/drm/sti/sti_vid.c
+++ b/drivers/gpu/drm/sti/sti_vid.c
@@ -124,16 +124,16 @@ static struct drm_info_list vid_debugfs_files[] = {
        { "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;
 
        for (i = 0; i < ARRAY_SIZE(vid_debugfs_files); i++)
                vid_debugfs_files[i].data = vid;
 
-       return drm_debugfs_create_files(vid_debugfs_files,
-                                       ARRAY_SIZE(vid_debugfs_files),
-                                       minor->debugfs_root, minor);
+       drm_debugfs_create_files(vid_debugfs_files,
+                                ARRAY_SIZE(vid_debugfs_files),
+                                minor->debugfs_root, minor);
 }
 
 void sti_vid_commit(struct sti_vid *vid,

diff --git a/drivers/gpu/drm/sti/sti_vid.h b/drivers/gpu/drm/sti/sti_vid.h
index 9dbd78461de12b419e4e4d7ae00b54c8be4d12d6..991849ba50b58845e181c071461543d8a17a1800 100644 (file)
--- a/drivers/gpu/drm/sti/sti_vid.h
+++ b/drivers/gpu/drm/sti/sti_vid.h
@@ -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,
                               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