linux-kernel - linux-next: build failure after merge of the driver-core tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240709163715.3bcd6ab3@canb.auug.org.au>
Date: Tue, 9 Jul 2024 16:37:15 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, Mauro Carvalho Chehab <mchehab@...nel.org>
Cc: David Plowman <david.plowman@...pberrypi.com>, Hans Verkuil
 <hverkuil-cisco@...all.nl>, Jacopo Mondi <jacopo.mondi@...asonboard.com>,
 Naushir Patuck <naush@...pberrypi.com>, Nick Hollinghurst
 <nick.hollinghurst@...pberrypi.org>, Sakari Ailus
 <sakari.ailus@...ux.intel.com>, Uwe Kleine-König
 <u.kleine-koenig@...gutronix.de>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: build failure after merge of the driver-core tree

Hi all,

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

drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
 1786 |         .remove         = pispbe_remove,
      |                           ^~~~~~~~~~~~~
drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: note: (near initialization for 'pispbe_pdrv.<anonymous>.remove')
cc1: all warnings being treated as errors

Caused by commit

  0edb555a65d1 ("platform: Make platform_driver::remove() return void")

interacting withc commit

  12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")

from the vl4-dvb-next tree.

I have applied the following fix up patch.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 9 Jul 2024 16:03:05 +1000
Subject: [PATCH] fix up for "platform: Make platform_driver::remove() return void"

interacting with commit

  12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE")

from the v4l-dvb-next tree.

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
index e74df5b116dc..7596ae1f7de6 100644
--- a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
+++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
@@ -1756,7 +1756,7 @@ static int pispbe_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int pispbe_remove(struct platform_device *pdev)
+static void pispbe_remove(struct platform_device *pdev)
 {
 	struct pispbe_dev *pispbe = platform_get_drvdata(pdev);
 
@@ -1765,8 +1765,6 @@ static int pispbe_remove(struct platform_device *pdev)
 	pispbe_runtime_suspend(pispbe->dev);
 	pm_runtime_dont_use_autosuspend(pispbe->dev);
 	pm_runtime_disable(pispbe->dev);
-
-	return 0;
 }
 
 static const struct dev_pm_ops pispbe_pm_ops = {
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped