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: 81720 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2327733vqo; Mon, 10 Apr 2023 21:41:26 -0700 (PDT) X-Google-Smtp-Source: AKy350Yr58i96AK7shNbb5LqOfWuTTrhgJDxJH/gDWfTX7cCU3RzVhmbqtAJDauGofWwvCH6ILbG X-Received: by 2002:a17:90a:5201:b0:23f:2486:5b53 with SMTP id v1-20020a17090a520100b0023f24865b53mr22382741pjh.17.1681188085458; Mon, 10 Apr 2023 21:41:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681188085; cv=none; d=google.com; s=arc-20160816; b=TGklIdUZAUFmGyCjnp8iR2ViT3B+zwHAqjL5nPvbfhLqpC1cIEUs2BlExufasSw+Wa WfgZSjgUBcpoK4lPThooIiXsvE2sPdC8Chx1GRzAmLBstSROELrc9iAJbYICahsvOPoM MextFndDnSNN5+qxtwbV2i030rRIA5DkG+bKgpSeH7xerMSLqgBRMF2SHezrBaM58eHO A4cHu8PpqHXpkRHcGTmWOfRX8qOacBdVgyW/AvOwFBnK3AzjuZ/h3oHeV41mpaQX4eff vQfU4rCh6w5iJ0hPfY6SSncF9YnAXnZy/ZFN7+F6fESJwDpN6VazcQt5u/pLVBFlNUgo xClQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=WdSzwCZdNIk1Z37Sc1D9XVh7arO8HT97XygbtDMgy60=; b=xhIiTu1lqhF7FBajaal6gM8PbOZdqFI7E5l/dCn3htXnFhKJKFzucdRH7Y82rhgkk7 FtGieXiIALi8eqQyGs9sNJUknF4tqLlqFykvIAKNdQwIaWrFkz34z8FcrI4H3wBcGBE4 1B/bDlnaej4+X8qABoVEXK9HPgJ5Tg1pQPxOAYHTFJGNsz5g9m0SpvD2zaGymyZroOdt 9kOrfb4iMZFzfoBAG0ImfJ7OoATOx7xSLZFQiTSs1o1IL0fm1LOISHrF2PJ990UzqszV BmwFZW9IFcvGo9DxecksFvqfuxk3P89xUUMLaIoxQrN2ubngw5dyW49mB/o6fJJPMn2V OtEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=uYMLANMP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bw18-20020a17090af61200b00233d1081c5fsi14615221pjb.52.2023.04.10.21.41.13; Mon, 10 Apr 2023 21:41:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=uYMLANMP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229964AbjDKEiU (ORCPT + 99 others); Tue, 11 Apr 2023 00:38:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229507AbjDKEiS (ORCPT ); Tue, 11 Apr 2023 00:38:18 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7975310FF; Mon, 10 Apr 2023 21:38:16 -0700 (PDT) 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 Cc: Jacek Lawrynowicz , Jeffrey Hugo , Pranjal Ramajor Asha Kanojiya , DRI , Linux Kernel Mailing List , Linux Next Mailing List 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-Spam-Status: No, score=-2.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762853478021081503?= X-GMAIL-MSGID: =?utf-8?q?1762853478021081503?= 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;