lkml.org 
[lkml]   [2022]   [Mar]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subjectlinux-next: build failure after merge of the amdgpu tree
Hi all,

After merging the amdgpu tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/tiny/panel-mipi-dbi.c:391:19: error: initialization of 'void (*)(struct spi_device *)' from incompatible pointer type 'int (*)(struct spi_device *)' [-Werror=incompatible-pointer-types]
391 | .remove = panel_mipi_dbi_spi_remove,
| ^~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

0e65e2e6abb0 ("drm/tiny: Add MIPI DBI compatible SPI driver")

interacting with commit

a0386bba7093 ("spi: make remove callback a void function")

from the spi trees.

I have applied the following merge fix.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Mar 2022 11:01:01 +1100
Subject: [PATCH] fix up for "spi: make remove callback a void function"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/tiny/panel-mipi-dbi.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/tiny/panel-mipi-dbi.c b/drivers/gpu/drm/tiny/panel-mipi-dbi.c
index 7f8c6c51387f..c759ff9c2c87 100644
--- a/drivers/gpu/drm/tiny/panel-mipi-dbi.c
+++ b/drivers/gpu/drm/tiny/panel-mipi-dbi.c
@@ -336,14 +336,12 @@ static int panel_mipi_dbi_spi_probe(struct spi_device *spi)
return 0;
}

-static int panel_mipi_dbi_spi_remove(struct spi_device *spi)
+static void panel_mipi_dbi_spi_remove(struct spi_device *spi)
{
struct drm_device *drm = spi_get_drvdata(spi);

drm_dev_unplug(drm);
drm_atomic_helper_shutdown(drm);
-
- return 0;
}

static void panel_mipi_dbi_spi_shutdown(struct spi_device *spi)
--
2.34.1
--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2022-03-07 01:15    [W:0.040 / U:0.916 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site