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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE380C54FD0 for ; Mon, 27 Apr 2020 11:24:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CCDFE205C9 for ; Mon, 27 Apr 2020 11:24:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726931AbgD0LYT (ORCPT ); Mon, 27 Apr 2020 07:24:19 -0400 Received: from mx2.suse.de ([195.135.220.15]:39090 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726260AbgD0LYS (ORCPT ); Mon, 27 Apr 2020 07:24:18 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id BADA4ABC2; Mon, 27 Apr 2020 11:24:15 +0000 (UTC) Message-ID: <4842d1b72192bb7c461a2d50c8798f178da964e0.camel@suse.de> Subject: Re: [PATCH v2 04/91] firmware: rpi: Only create clocks device if we don't have a node for it From: Nicolas Saenz Julienne To: Maxime Ripard , Eric Anholt Cc: dri-devel@lists.freedesktop.org, linux-rpi-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Dave Stevenson , Tim Gover , Phil Elwell Date: Mon, 27 Apr 2020 13:24:14 +0200 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-t2CrNR4eS4OpaMihaaXw" User-Agent: Evolution 3.34.4 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-t2CrNR4eS4OpaMihaaXw Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Maxime, On Fri, 2020-04-24 at 17:33 +0200, Maxime Ripard wrote: > The firmware clocks driver was previously probed through a platform_devic= e > created by the firmware driver. >=20 > Since we will now have a node for that clocks driver, we need to create t= he > device only in the case where there's no node for it already. >=20 > Signed-off-by: Maxime Ripard > --- > drivers/firmware/raspberrypi.c | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberryp= i.c > index da26a584dca0..1874f41b007c 100644 > --- a/drivers/firmware/raspberrypi.c > +++ b/drivers/firmware/raspberrypi.c > @@ -210,6 +210,15 @@ rpi_register_hwmon_driver(struct device *dev, struct > rpi_firmware *fw) > =20 > static void rpi_register_clk_driver(struct device *dev) > { > + /* > + * Earlier DTs don't have a node for the firmware clocks but > + * rely on us creating a platform device by hand. If we do > + * have a node for the firmware clocks, just bail out here. > + */ > + if (of_get_compatible_child(dev->of_node, > + "raspberrypi,firmware-clocks")) > + return; > + > rpi_clk =3D platform_device_register_data(dev, "raspberrypi-clk", > -1, NULL, 0); > } > @@ -262,8 +271,12 @@ static int rpi_firmware_remove(struct platform_devic= e > *pdev) > =20 > platform_device_unregister(rpi_hwmon); > rpi_hwmon =3D NULL; > - platform_device_unregister(rpi_clk); > - rpi_clk =3D NULL; > + > + if (rpi_clk) { rpi_clk, being a static global variable, will be zeroed by default. So, if = you don't register the platform device, rpi_clk is going to be NULL, which you'= re allowed to feed platform_device_unregister(), so no need to be extra carefu= l. Regards, Nicolas > + platform_device_unregister(rpi_clk); > + rpi_clk =3D NULL; > + } > + > mbox_free_channel(fw->chan); > =20 > return 0; --=-t2CrNR4eS4OpaMihaaXw Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEErOkkGDHCg2EbPcGjlfZmHno8x/4FAl6mwN4ACgkQlfZmHno8 x/5xXAf+Ng2E3SKjoUMbR1+VP/yWSENtjk2GqBEMGPPIZYYmsbkt9al9HYQZJ5C3 nwOXe0b3145xT5Von1/JrpzL3sPIp29cbA9zYKU+7x+WpZtSctau+dkeM5VpTPdw hHu01BPVOX2KJERjvB8u4y25U2Xpm1LzosEf9CFGDxng3LDaBrgP4j779Oq9sbq3 0pfATYlX1KFsMwbN3twlsShGwuokSb6kdcrKj53kBP2alNxL2dGpre4COea33YAx Ro1hGda3eGhqBndalntUHQ0MsSiKIwdkQP4H287W+D7UPb46ee0GdRcoVohqQadY W9mJfQMFIP2MiJ/tYqxOUPFqBrJi7A== =fYAz -----END PGP SIGNATURE----- --=-t2CrNR4eS4OpaMihaaXw--