Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 23 Jul 2021 15:09:44 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, Dave Airlie <airlied@linux.ie>,
        DRI <dri-devel@lists.freedesktop.org>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Uwe =?UTF-8?B?S2xl?= =?UTF-8?B?aW5lLUvDtm5pZw==?= 
        <u.kleine-koenig@pengutronix.de>,
        Douglas Anderson <dianders@chromium.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the driver-core tree
Message-ID: <20210723150944.528c10af@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/N.p3av4.tDKwa2IJNFAHPjL";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/N.p3av4.tDKwa2IJNFAHPjL
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

drivers/gpu/drm/drm_dp_aux_bus.c:106:13: error: initialization of 'void (*)=
(struct device *)' from incompatible pointer type 'int (*)(struct device *)=
' [-Werror=3Dincompatible-pointer-types]
  106 |  .remove  =3D dp_aux_ep_remove,
      |             ^~~~~~~~~~~~~~~~
drivers/gpu/drm/drm_dp_aux_bus.c:106:13: note: (near initialization for 'dp=
_aux_bus_type.remove')

Caused by commit

  aeb33699fc2c ("drm: Introduce the DP AUX bus")

from the drm tree interacting with commit

  fc7a6209d571 ("bus: Make remove callback return void")

from the driver-core tree.

I applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 23 Jul 2021 14:58:25 +1000
Subject: [PATCH] fix for "drm: Introduce the DP AUX bus"

interaction with "bus: Make remove callback return void"

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

diff --git a/drivers/gpu/drm/drm_dp_aux_bus.c b/drivers/gpu/drm/drm_dp_aux_=
bus.c
index e49a70f3691b..298ea7a49591 100644
--- a/drivers/gpu/drm/drm_dp_aux_bus.c
+++ b/drivers/gpu/drm/drm_dp_aux_bus.c
@@ -67,9 +67,8 @@ static int dp_aux_ep_probe(struct device *dev)
  *
  * Calls through to the endpoint driver remove.
  *
- * Return: 0 if no error or negative error code.
  */
-static int dp_aux_ep_remove(struct device *dev)
+static void dp_aux_ep_remove(struct device *dev)
 {
 	struct dp_aux_ep_driver *aux_ep_drv =3D to_dp_aux_ep_drv(dev->driver);
 	struct dp_aux_ep_device *aux_ep =3D to_dp_aux_ep_dev(dev);
@@ -77,8 +76,6 @@ static int dp_aux_ep_remove(struct device *dev)
 	if (aux_ep_drv->remove)
 		aux_ep_drv->remove(aux_ep);
 	dev_pm_domain_detach(dev, true);
-
-	return 0;
 }
=20
 /**
--=20
2.30.2

--=20
Cheers,
Stephen Rothwell

--Sig_/N.p3av4.tDKwa2IJNFAHPjL
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmD6TxgACgkQAVBC80lX
0Gy+Lgf9FGVOJRXFvvJLtV6FWF56PwDTTK0Yl3W7qqVr656qhOjnlWgoS/SfR+DV
SpaU+wjOGEBqJ7cNF9nrfx1fcvRDGpd4sfIyo6WDNbiLKVGw0TVFtuf5VAThZrie
uRBZJ2i4Cn993JgtWon1ZJb3UeD9WMgHYkmXMBdt6edvm7a8eBzjQxJMTGmDEDyr
5KIC85CWI36jtbuFRlj6bCrHKml0hy3mLGFN8Le2vuea3krLHYFd0Liu/rtV2PIz
tvsxO7Xi1W3o+po+/eRtjs3TVtOWQ3j8g7yCehodLpw9YiGaB+K1Doa/mhaaiiAS
bJxasXotd3oUD6B2sXe5BXQ+kS565g==
=Piz8
-----END PGP SIGNATURE-----

--Sig_/N.p3av4.tDKwa2IJNFAHPjL--