From patchwork Tue Apr 11 04:38:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13207048 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6303FC77B73 for ; Tue, 11 Apr 2023 04:38:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B27910E480; Tue, 11 Apr 2023 04:38:22 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 34F9D10E480 for ; Tue, 11 Apr 2023 04:38:19 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4PwY4P6hPMz4xDh; Tue, 11 Apr 2023 14:38:13 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1681187894; bh=WdSzwCZdNIk1Z37Sc1D9XVh7arO8HT97XygbtDMgy60=; h=Date:From:To:Cc:Subject:From; b=uYMLANMPITzNsdWvDMXmJCKRGFyxfTh+fPL8h3ELKKWRo8qmYu4DXxXvLiVrZYlCp y+MgWLG9pF1pcR/KBJbabELnZpxroDlL0qcfz3k0occz9hs7tQqKFHiXfmmNFfo92+ zrZRIglKt1HsDpcmwJq4rCLvcG9fE8xiYYO7ERYvolZDDbeNnhosjqBg/LIDXP8N3A 7kfHSYlzXGMqa5ppxGFIMRbUo2ZNf8Pzx3tTaC0wyIh4w6zVxlLBu4XQotVasQmvGE XP9PsvpiUlk1Mc5kyayn6qQBYwZmLdnRys4FPN/48lUFGevLJcz+WmNZVdSl9TWXu8 kR9twwQnskM4A== Date: Tue, 11 Apr 2023 14:38:12 +1000 From: Stephen Rothwell To: Greg KH , Dave Airlie Subject: linux-next: build failure after merge of the driver-core tree Message-ID: <20230411143812.11a4b00d@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jeffrey Hugo , Linux Kernel Mailing List , DRI , Pranjal Ramajor Asha Kanojiya , Linux Next Mailing List , Jacek Lawrynowicz Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, After merging the driver-core tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from include/linux/linkage.h:7, from include/linux/kernel.h:17, from drivers/accel/qaic/mhi_qaic_ctrl.c:4: drivers/accel/qaic/mhi_qaic_ctrl.c: In function 'mhi_qaic_ctrl_init': include/linux/export.h:27:22: error: passing argument 1 of 'class_create' from incompatible pointer type [-Werror=incompatible-pointer-types] 27 | #define THIS_MODULE (&__this_module) | ~^~~~~~~~~~~~~~~ | | | struct module * drivers/accel/qaic/mhi_qaic_ctrl.c:544:38: note: in expansion of macro 'THIS_MODULE' 544 | mqc_dev_class = class_create(THIS_MODULE, MHI_QAIC_CTRL_DRIVER_NAME); | ^~~~~~~~~~~ In file included from include/linux/device.h:31, from include/linux/mhi.h:9, from drivers/accel/qaic/mhi_qaic_ctrl.c:5: include/linux/device/class.h:229:54: note: expected 'const char *' but argument is of type 'struct module *' 229 | struct class * __must_check class_create(const char *name); | ~~~~~~~~~~~~^~~~ drivers/accel/qaic/mhi_qaic_ctrl.c:544:25: error: too many arguments to function 'class_create' 544 | mqc_dev_class = class_create(THIS_MODULE, MHI_QAIC_CTRL_DRIVER_NAME); | ^~~~~~~~~~~~ include/linux/device/class.h:229:29: note: declared here 229 | struct class * __must_check class_create(const char *name); | ^~~~~~~~~~~~ Caused by commit 1aaba11da9aa ("driver core: class: remove module * from class_create()") interacting with commit 566fc96198b4 ("accel/qaic: Add mhi_qaic_cntl") from the drm tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Tue, 11 Apr 2023 14:16:57 +1000 Subject: [PATCH] fixup for "driver core: class: remove module * from class_create()" interacting with "accel/qaic: Add mhi_qaic_cntl" Signed-off-by: Stephen Rothwell --- drivers/accel/qaic/mhi_qaic_ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/accel/qaic/mhi_qaic_ctrl.c b/drivers/accel/qaic/mhi_qaic_ctrl.c index 0c7e571f1f12..96db1580c72d 100644 --- a/drivers/accel/qaic/mhi_qaic_ctrl.c +++ b/drivers/accel/qaic/mhi_qaic_ctrl.c @@ -541,7 +541,7 @@ int mhi_qaic_ctrl_init(void) return ret; mqc_dev_major = ret; - mqc_dev_class = class_create(THIS_MODULE, MHI_QAIC_CTRL_DRIVER_NAME); + mqc_dev_class = class_create(MHI_QAIC_CTRL_DRIVER_NAME); if (IS_ERR(mqc_dev_class)) { ret = PTR_ERR(mqc_dev_class); goto unregister_chrdev;