UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/tegra: debugfs cleanup cannot fail 

The debugfs cleanup code never fails, so no error is returned. Therefore
the functions can all return void instead.

Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Thierry Reding 2014-12-19 15:47:30 +01:00
parent 6fad8f66d7
commit 4009c22420
3 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/tegra/dsi.c
View File

@ -228,7 +228,7 @@ remove:
return err;
}
static int tegra_dsi_debugfs_exit(struct tegra_dsi *dsi)
static void tegra_dsi_debugfs_exit(struct tegra_dsi *dsi)
{
drm_debugfs_remove_files(dsi->debugfs_files, ARRAY_SIZE(debugfs_files),
dsi->minor);
@ -239,8 +239,6 @@ static int tegra_dsi_debugfs_exit(struct tegra_dsi *dsi)
debugfs_remove(dsi->debugfs);
dsi->debugfs = NULL;
return 0;
}
#define PKT_ID0(id) ((((id) & 0x3f) << 3) | (1 << 9))
@ -1025,15 +1023,11 @@ reset:
static int tegra_dsi_exit(struct host1x_client *client)
{
struct tegra_dsi *dsi = host1x_client_to_dsi(client);
int err;
tegra_output_exit(&dsi->output);
if (IS_ENABLED(CONFIG_DEBUG_FS)) {
err = tegra_dsi_debugfs_exit(dsi);
if (err < 0)
dev_err(dsi->dev, "debugfs cleanup failed: %d\n", err);
}
if (IS_ENABLED(CONFIG_DEBUG_FS))
tegra_dsi_debugfs_exit(dsi);
reset_control_assert(dsi->rst);

13
drivers/gpu/drm/tegra/hdmi.c
View File

@ -1310,7 +1310,7 @@ remove:
return err;
}
static int tegra_hdmi_debugfs_exit(struct tegra_hdmi *hdmi)
static void tegra_hdmi_debugfs_exit(struct tegra_hdmi *hdmi)
{
drm_debugfs_remove_files(hdmi->debugfs_files, ARRAY_SIZE(debugfs_files),
hdmi->minor);
@ -1321,8 +1321,6 @@ static int tegra_hdmi_debugfs_exit(struct tegra_hdmi *hdmi)
debugfs_remove(hdmi->debugfs);
hdmi->debugfs = NULL;
return 0;
}
static int tegra_hdmi_init(struct host1x_client *client)
@ -1393,7 +1391,6 @@ static int tegra_hdmi_init(struct host1x_client *client)
static int tegra_hdmi_exit(struct host1x_client *client)
{
struct tegra_hdmi *hdmi = host1x_client_to_hdmi(client);
int err;
tegra_output_exit(&hdmi->output);
@ -1404,12 +1401,8 @@ static int tegra_hdmi_exit(struct host1x_client *client)
regulator_disable(hdmi->pll);
regulator_disable(hdmi->hdmi);
if (IS_ENABLED(CONFIG_DEBUG_FS)) {
err = tegra_hdmi_debugfs_exit(hdmi);
if (err < 0)
dev_err(client->dev, "debugfs cleanup failed: %d\n",
err);
}
if (IS_ENABLED(CONFIG_DEBUG_FS))
tegra_hdmi_debugfs_exit(hdmi);
return 0;
}

11
drivers/gpu/drm/tegra/sor.c
View File

@ -710,12 +710,10 @@ remove:
return err;
}
static int tegra_sor_debugfs_exit(struct tegra_sor *sor)
static void tegra_sor_debugfs_exit(struct tegra_sor *sor)
{
debugfs_remove_recursive(sor->debugfs);
sor->debugfs = NULL;
return 0;
}
static void tegra_sor_connector_dpms(struct drm_connector *connector, int mode)
@ -1410,11 +1408,8 @@ static int tegra_sor_exit(struct host1x_client *client)
clk_disable_unprepare(sor->clk_dp);
clk_disable_unprepare(sor->clk);
if (IS_ENABLED(CONFIG_DEBUG_FS)) {
err = tegra_sor_debugfs_exit(sor);
if (err < 0)
dev_err(sor->dev, "debugfs cleanup failed: %d\n", err);
}
if (IS_ENABLED(CONFIG_DEBUG_FS))
tegra_sor_debugfs_exit(sor);
return 0;
}