From mboxrd@z Thu Jan 1 00:00:00 1970 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 3FF06C433EF for ; Wed, 6 Apr 2022 08:56:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9CF9510E218; Wed, 6 Apr 2022 08:56:54 +0000 (UTC) Received: from aposti.net (aposti.net [89.234.176.197]) by gabe.freedesktop.org (Postfix) with ESMTPS id D4D5610E218 for ; Wed, 6 Apr 2022 08:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1649235406; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YEZzm96WsgNKWPm41tm0nV++Aa+9P3fevYoGMhYP/zw=; b=K+QzKAh62GkPKnK6Gcgil9rxSfp1+cvt8KVYpFNbuVCaJH7XGTYwPrKQ3lC7uwqNN8o536 3JB6vTsSqYEFI1tFPO+F5hs2nPadagcbo0of12TC1/Y+AvX3xXOncEdw7MmSOglpKij/Vg BEoimLtYd35UCWOAMqeHaRsgdOEH7sg= Date: Wed, 06 Apr 2022 09:56:31 +0100 From: Paul Cercueil Subject: Re: linux-next: build failure after merge of the drm-misc tree To: Stephen Rothwell Message-Id: <76UW9R.TLZ8ZU2LVHZW2@crapouillou.net> In-Reply-To: <20220406105049.5f5e01c1@canb.auug.org.au> References: <20220406105049.5f5e01c1@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable 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: Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Mark Brown , Linux Next Mailing List , Christophe Branchereau Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Stephen, Le mer., avril 6 2022 at 10:50:49 +1000, Stephen Rothwell=20 a =E9crit : > Hi all, >=20 > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: >=20 > drivers/gpu/drm/panel/panel-newvision-nv3052c.c:478:19: error:=20 > initialization of 'void (*)(struct spi_device *)' from incompatible=20 > pointer type 'int (*)(struct spi_device *)'=20 > [-Werror=3Dincompatible-pointer-types] > 478 | .remove =3D nv3052c_remove, > | ^~~~~~~~~~~~~~ > drivers/gpu/drm/panel/panel-newvision-nv3052c.c:478:19: note: (near=20 > initialization for 'nv3052c_driver.remove') >=20 > Caused by commit >=20 > 49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C=20 > based LCDs") >=20 > interacting with commit >=20 > 2cbfa2128662 ("spi: make remove callback a void function") >=20 > from Linus' tree (merged in v5.18-rc1). >=20 > I applied the following merge resolution patch for today. Sorry about that, my fault. I compile-tested Christophe's patchset *then* rebased to the latest=20 drm-misc-next and pushed, should have done the other way around. -Paul > From: Stephen Rothwell > Date: Wed, 6 Apr 2022 10:46:57 +1000 > Subject: [PATCH] fixup for "spi: make remove callback a void function" >=20 > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) >=20 > diff --git a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c=20 > b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c > index 127bcfdb59df..cf078f0d3cd3 100644 > --- a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c > +++ b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c > @@ -416,15 +416,13 @@ static int nv3052c_probe(struct spi_device *spi) > return 0; > } >=20 > -static int nv3052c_remove(struct spi_device *spi) > +static void nv3052c_remove(struct spi_device *spi) > { > struct nv3052c *priv =3D spi_get_drvdata(spi); >=20 > drm_panel_remove(&priv->panel); > drm_panel_disable(&priv->panel); > drm_panel_unprepare(&priv->panel); > - > - return 0; > } >=20 > static const struct drm_display_mode ltk035c5444t_modes[] =3D { > -- > 2.35.1 >=20 > -- > Cheers, > Stephen Rothwell From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BE53C433EF for ; Wed, 6 Apr 2022 12:55:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229863AbiDFM5C (ORCPT ); Wed, 6 Apr 2022 08:57:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229843AbiDFM4s (ORCPT ); Wed, 6 Apr 2022 08:56:48 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89D031A61CA; Wed, 6 Apr 2022 01:56:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1649235406; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YEZzm96WsgNKWPm41tm0nV++Aa+9P3fevYoGMhYP/zw=; b=K+QzKAh62GkPKnK6Gcgil9rxSfp1+cvt8KVYpFNbuVCaJH7XGTYwPrKQ3lC7uwqNN8o536 3JB6vTsSqYEFI1tFPO+F5hs2nPadagcbo0of12TC1/Y+AvX3xXOncEdw7MmSOglpKij/Vg BEoimLtYd35UCWOAMqeHaRsgdOEH7sg= Date: Wed, 06 Apr 2022 09:56:31 +0100 From: Paul Cercueil Subject: Re: linux-next: build failure after merge of the drm-misc tree To: Stephen Rothwell Cc: Daniel Vetter , Intel Graphics , DRI , Christophe Branchereau , Mark Brown , Linux Kernel Mailing List , Linux Next Mailing List Message-Id: <76UW9R.TLZ8ZU2LVHZW2@crapouillou.net> In-Reply-To: <20220406105049.5f5e01c1@canb.auug.org.au> References: <20220406105049.5f5e01c1@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, Le mer., avril 6 2022 at 10:50:49 +1000, Stephen Rothwell=20 a =E9crit : > Hi all, >=20 > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: >=20 > drivers/gpu/drm/panel/panel-newvision-nv3052c.c:478:19: error:=20 > initialization of 'void (*)(struct spi_device *)' from incompatible=20 > pointer type 'int (*)(struct spi_device *)'=20 > [-Werror=3Dincompatible-pointer-types] > 478 | .remove =3D nv3052c_remove, > | ^~~~~~~~~~~~~~ > drivers/gpu/drm/panel/panel-newvision-nv3052c.c:478:19: note: (near=20 > initialization for 'nv3052c_driver.remove') >=20 > Caused by commit >=20 > 49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C=20 > based LCDs") >=20 > interacting with commit >=20 > 2cbfa2128662 ("spi: make remove callback a void function") >=20 > from Linus' tree (merged in v5.18-rc1). >=20 > I applied the following merge resolution patch for today. Sorry about that, my fault. I compile-tested Christophe's patchset *then* rebased to the latest=20 drm-misc-next and pushed, should have done the other way around. -Paul > From: Stephen Rothwell > Date: Wed, 6 Apr 2022 10:46:57 +1000 > Subject: [PATCH] fixup for "spi: make remove callback a void function" >=20 > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) >=20 > diff --git a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c=20 > b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c > index 127bcfdb59df..cf078f0d3cd3 100644 > --- a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c > +++ b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c > @@ -416,15 +416,13 @@ static int nv3052c_probe(struct spi_device *spi) > return 0; > } >=20 > -static int nv3052c_remove(struct spi_device *spi) > +static void nv3052c_remove(struct spi_device *spi) > { > struct nv3052c *priv =3D spi_get_drvdata(spi); >=20 > drm_panel_remove(&priv->panel); > drm_panel_disable(&priv->panel); > drm_panel_unprepare(&priv->panel); > - > - return 0; > } >=20 > static const struct drm_display_mode ltk035c5444t_modes[] =3D { > -- > 2.35.1 >=20 > -- > Cheers, > Stephen Rothwell