Received-SPF: pass (google.com: domain of linux-kernel+bounces-166749-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240501084110.4165-2-shresthprasad7@gmail.com> <f1707254-ec32-4884-275a-c3c85b48d7d5@linux.intel.com>
In-Reply-To: <f1707254-ec32-4884-275a-c3c85b48d7d5@linux.intel.com>
From: Shresth Prasad <shresthprasad7@gmail.com>
Date: Thu, 2 May 2024 22:21:16 +0530
Message-ID: <CAE8VWiJy-2x6sKCAmN69Uq9Kf1cTRnaJezOoLDyZ0SbgPWuHAQ@mail.gmail.com>
Subject: Re: [PATCH v2][next] tty: sunsu: Simplify device_node cleanup by
 using __free
To: =?UTF-8?Q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
Cc: davem@davemloft.net, gregkh@linuxfoundation.org, jirislaby@kernel.org, 
	sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, 
	linux-serial@vger.kernel.org, javier.carrasco.cruz@gmail.com, 
	skhan@linuxfoundation.org, Julia Lawall <julia.lawall@inria.fr>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Thu, May 2, 2024 at 9:35=E2=80=AFPM Ilpo J=C3=A4rvinen
<ilpo.jarvinen@linux.intel.com> wrote:
>
> On Wed, 1 May 2024, Shresth Prasad wrote:
>
> > Add `__free` function attribute to `ap` and `match` pointer
> > initialisations which ensure that the pointers are freed as soon as the=
y
> > go out of scope, thus removing the need to manually free them using
> > `of_node_put`.
> >
> > This also removes the need for the `goto` statement and the `rc`
> > variable.
> >
> > Tested using a qemu x86_64 virtual machine.
>
> Eh, how can you test this with an x86_64 VM ???
>
> config SERIAL_SUNSU
>         tristate "Sun SU serial support"
>         depends on SPARC && PCI
>

By that, I mean that I compiled the kernel and ran the produced bzImage
on a x86_64 qemu machine.
I unfortunately don't have the hardware to test it on, but I don't
think the change is complex enough to require testing on real hardware
(unless I'm assuming incorrectly).

Regards,
Shresth

> > Suggested-by: Julia Lawall <julia.lawall@inria.fr>
> > Signed-off-by: Shresth Prasad <shresthprasad7@gmail.com>
> > ---
> > Changes in v2:
> >     - Specify how the patch was tested
> >
> >  drivers/tty/serial/sunsu.c | 37 +++++++++++--------------------------
> >  1 file changed, 11 insertions(+), 26 deletions(-)
> >
> > diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
> > index 67a5fc70bb4b..0f463da5e7ce 100644
> > --- a/drivers/tty/serial/sunsu.c
> > +++ b/drivers/tty/serial/sunsu.c
> > @@ -1382,44 +1382,29 @@ static inline struct console *SUNSU_CONSOLE(voi=
d)
> >
> >  static enum su_type su_get_type(struct device_node *dp)
> >  {
> > -     struct device_node *ap =3D of_find_node_by_path("/aliases");
> > -     enum su_type rc =3D SU_PORT_PORT;
> > +     struct device_node *ap __free(device_node) =3D
> > +                         of_find_node_by_path("/aliases");
> >
> >       if (ap) {
> >               const char *keyb =3D of_get_property(ap, "keyboard", NULL=
);
> >               const char *ms =3D of_get_property(ap, "mouse", NULL);
> > -             struct device_node *match;
> >
> >               if (keyb) {
> > -                     match =3D of_find_node_by_path(keyb);
> > +                     struct device_node *match __free(device_node) =3D
> > +                                         of_find_node_by_path(keyb);
> >
> > -                     /*
> > -                      * The pointer is used as an identifier not
> > -                      * as a pointer, we can drop the refcount on
> > -                      * the of__node immediately after getting it.
> > -                      */
> > -                     of_node_put(match);
> > -
> > -                     if (dp =3D=3D match) {
> > -                             rc =3D SU_PORT_KBD;
> > -                             goto out;
> > -                     }
> > +                     if (dp =3D=3D match)
> > +                             return SU_PORT_KBD;
> >               }
> >               if (ms) {
> > -                     match =3D of_find_node_by_path(ms);
> > +                     struct device_node *match __free(device_node) =3D
> > +                                         of_find_node_by_path(ms);
> >
> > -                     of_node_put(match);
> > -
> > -                     if (dp =3D=3D match) {
> > -                             rc =3D SU_PORT_MS;
> > -                             goto out;
> > -                     }
> > +                     if (dp =3D=3D match)
> > +                             return SU_PORT_MS;
> >               }
> >       }
> > -
> > -out:
> > -     of_node_put(ap);
> > -     return rc;
> > +     return SU_PORT_PORT;
> >  }
> >
> >  static int su_probe(struct platform_device *op)
> >