diff options
| author |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-03-22 17:52:10 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-03-22 17:52:10 -0300 |
| commit | 34fe4ccb777e2c15a3419fa8e733114f6ce2a3c6 (patch) | |
| tree | f07755c842475c4f9d4c67e126d154158eb8ccbb /drivers/gpu/drm/panel/panel-abt-y030xx067a.c | |
| parent | perf ftrace latency: Update documentation (diff) | |
| parent | Merge tag 'for-5.18-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux (diff) | |
| download | linux-dev-34fe4ccb777e2c15a3419fa8e733114f6ce2a3c6.tar.xz linux-dev-34fe4ccb777e2c15a3419fa8e733114f6ce2a3c6.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes that went thru perf/urgent and now are fixed by an
upcoming patch.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/panel/panel-abt-y030xx067a.c')
| -rw-r--r-- | drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/panel/panel-abt-y030xx067a.c b/drivers/gpu/drm/panel/panel-abt-y030xx067a.c index f043b484055b..ed626fdc08e8 100644 --- a/drivers/gpu/drm/panel/panel-abt-y030xx067a.c +++ b/drivers/gpu/drm/panel/panel-abt-y030xx067a.c @@ -293,15 +293,13 @@ static int y030xx067a_probe(struct spi_device *spi) return 0; } -static int y030xx067a_remove(struct spi_device *spi) +static void y030xx067a_remove(struct spi_device *spi) { struct y030xx067a *priv = spi_get_drvdata(spi); drm_panel_remove(&priv->panel); drm_panel_disable(&priv->panel); drm_panel_unprepare(&priv->panel); - - return 0; } static const struct drm_display_mode y030xx067a_modes[] = { |