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:   Tue, 27 Jul 2021 19:47:30 +1000 (AEST)
From:   Finn Thain <fthain@linux-m68k.org>
To:     =?UTF-8?Q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-kernel@vger.kernel.org, kernel@pengutronix.de,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Zhang Qilong <zhangqilong3@huawei.com>,
        Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
        netdev@vger.kernel.org, linux-m68k@lists.linux-m68k.org
Subject: Re: [PATCH 2/5] nubus: Make struct nubus_driver::remove return
 void
In-Reply-To: <20210727080840.3550927-3-u.kleine-koenig@pengutronix.de>
Message-ID: <59bc4bf-7e8e-24be-5a7a-d165e6b73c32@linux-m68k.org>
References: <20210727080840.3550927-1-u.kleine-koenig@pengutronix.de> <20210727080840.3550927-3-u.kleine-koenig@pengutronix.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; BOUNDARY="-1463811774-1321263043-1627379041=:27"
Content-ID: <5c95884-21f4-a5b0-c5ad-12dc7ae6ffc8@nippy.intranet>
Precedence: bulk

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

---1463811774-1321263043-1627379041=:27
Content-Type: text/plain; CHARSET=UTF-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Content-ID: <4427256-e4b9-b8ee-c183-114bc2c5c61e@nippy.intranet>

On Tue, 27 Jul 2021, Uwe Kleine-K=C3=B6nig wrote:

> The nubus core ignores the return value of the remove callback (in
> nubus_device_remove()) and all implementers return 0 anyway.
>=20
> So make it impossible for future drivers to return an unused error code
> by changing the remove prototype to return void.
>=20
> Signed-off-by: Uwe Kleine-K=C3=B6nig <u.kleine-koenig@pengutronix.de>

Acked-by: Finn Thain <fthain@linux-m68k.org>

> ---
>  drivers/net/ethernet/8390/mac8390.c     | 3 +--
>  drivers/net/ethernet/natsemi/macsonic.c | 4 +---
>  include/linux/nubus.h                   | 2 +-
>  3 files changed, 3 insertions(+), 6 deletions(-)
>=20
> diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8=
390/mac8390.c
> index 9aac7119d382..91b04abfd687 100644
> --- a/drivers/net/ethernet/8390/mac8390.c
> +++ b/drivers/net/ethernet/8390/mac8390.c
> @@ -428,13 +428,12 @@ static int mac8390_device_probe(struct nubus_board =
*board)
>  =09return err;
>  }
> =20
> -static int mac8390_device_remove(struct nubus_board *board)
> +static void mac8390_device_remove(struct nubus_board *board)
>  {
>  =09struct net_device *dev =3D nubus_get_drvdata(board);
> =20
>  =09unregister_netdev(dev);
>  =09free_netdev(dev);
> -=09return 0;
>  }
> =20
>  static struct nubus_driver mac8390_driver =3D {
> diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethern=
et/natsemi/macsonic.c
> index 2289e1fe3741..8709d700e15a 100644
> --- a/drivers/net/ethernet/natsemi/macsonic.c
> +++ b/drivers/net/ethernet/natsemi/macsonic.c
> @@ -603,7 +603,7 @@ static int mac_sonic_nubus_probe(struct nubus_board *=
board)
>  =09return err;
>  }
> =20
> -static int mac_sonic_nubus_remove(struct nubus_board *board)
> +static void mac_sonic_nubus_remove(struct nubus_board *board)
>  {
>  =09struct net_device *ndev =3D nubus_get_drvdata(board);
>  =09struct sonic_local *lp =3D netdev_priv(ndev);
> @@ -613,8 +613,6 @@ static int mac_sonic_nubus_remove(struct nubus_board =
*board)
>  =09=09=09  SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
>  =09=09=09  lp->descriptors, lp->descriptors_laddr);
>  =09free_netdev(ndev);
> -
> -=09return 0;
>  }
> =20
>  static struct nubus_driver mac_sonic_nubus_driver =3D {
> diff --git a/include/linux/nubus.h b/include/linux/nubus.h
> index eba50b057f6f..392fc6c53e96 100644
> --- a/include/linux/nubus.h
> +++ b/include/linux/nubus.h
> @@ -86,7 +86,7 @@ extern struct list_head nubus_func_rsrcs;
>  struct nubus_driver {
>  =09struct device_driver driver;
>  =09int (*probe)(struct nubus_board *board);
> -=09int (*remove)(struct nubus_board *board);
> +=09void (*remove)(struct nubus_board *board);
>  };
> =20
>  extern struct bus_type nubus_bus_type;
>=20
---1463811774-1321263043-1627379041=:27--