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;
From:   Jerome Pouiller <Jerome.Pouiller@silabs.com>
To:     Arnd Bergmann <arnd@arndb.de>
CC:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Jules Irenge <jbi.octave@gmail.com>,
        =?iso-8859-2?Q?Micha=B3_Miros=B3aw?= <mirq-linux@rere.qmqm.pl>,
        "devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] staging: wfx: avoid compiler warning on empty array
Thread-Topic: [PATCH] staging: wfx: avoid compiler warning on empty array
Thread-Index: AQHWHjF5vlfoO7puXUWgUhn1WHjUDaiQQ0QA
Date:   Wed, 29 Apr 2020 16:04:16 +0000
Message-ID: <3943343.tW1xmJHsB6@pc-42>
References: <20200429142119.1735196-1-arnd@arndb.de>
In-Reply-To: <20200429142119.1735196-1-arnd@arndb.de>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="iso-8859-2"
Content-ID: <8DC2BB2508D84F49A627E80CC3308FE3@namprd11.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 5e3ab641-8e68-44f3-c678-08d7ec56f822
X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Apr 2020 16:04:16.9266
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 54dbd822-5231-4b20-944d-6f4abcd541fb
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: tmrOUnZcz9gUkT5BfcotSOJvCF4P8IuSbdA8qO11BWemkK9y2uoL5ObdqqlQZiBai+/RTjmgdKauMxp+zzOoyA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB0014
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wednesday 29 April 2020 16:21:09 CEST Arnd Bergmann wrote:
>=20
> When CONFIG_OF is disabled, gcc-9 produces a warning about the
> wfx_sdio_of_match[] array having a declaration without a dimension:
>=20
> drivers/staging/wfx/bus_sdio.c:159:34: error: array 'wfx_sdio_of_match' a=
ssumed to have one element [-Werror]
>   159 | static const struct of_device_id wfx_sdio_of_match[];
>       |                                  ^~~~~~~~~~~~~~~~~
>=20
> Move the proper declaration up and out of the #ifdef instead.
>=20
> Fixes: a7a91ca5a23d ("staging: wfx: add infrastructure for new driver")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/staging/wfx/bus_sdio.c | 19 ++++++++-----------
>  1 file changed, 8 insertions(+), 11 deletions(-)
>=20
> diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdi=
o.c
> index dedc3ff58d3e..c2e4bd1e3b0a 100644
> --- a/drivers/staging/wfx/bus_sdio.c
> +++ b/drivers/staging/wfx/bus_sdio.c
> @@ -156,7 +156,13 @@ static const struct hwbus_ops wfx_sdio_hwbus_ops =3D=
 {
>         .align_size             =3D wfx_sdio_align_size,
>  };
>=20
> -static const struct of_device_id wfx_sdio_of_match[];
> +static const struct of_device_id wfx_sdio_of_match[] =3D {
> +       { .compatible =3D "silabs,wfx-sdio" },
> +       { .compatible =3D "silabs,wf200" },
> +       { },
> +};
> +MODULE_DEVICE_TABLE(of, wfx_sdio_of_match);
I suggest to keep the '#ifdef CONFIG_OF' around this definition. If
CONFIG_OF is undefined, of_match_ptr() and of_match_node() will be NULL
and it should compile.


> +
>  static int wfx_sdio_probe(struct sdio_func *func,
>                           const struct sdio_device_id *id)
>  {
> @@ -248,15 +254,6 @@ static const struct sdio_device_id wfx_sdio_ids[] =
=3D {
>  };
>  MODULE_DEVICE_TABLE(sdio, wfx_sdio_ids);
>=20
> -#ifdef CONFIG_OF
> -static const struct of_device_id wfx_sdio_of_match[] =3D {
> -       { .compatible =3D "silabs,wfx-sdio" },
> -       { .compatible =3D "silabs,wf200" },
> -       { },
> -};
> -MODULE_DEVICE_TABLE(of, wfx_sdio_of_match);
> -#endif
> -
>  struct sdio_driver wfx_sdio_driver =3D {
>         .name =3D "wfx-sdio",
>         .id_table =3D wfx_sdio_ids,
> @@ -264,6 +261,6 @@ struct sdio_driver wfx_sdio_driver =3D {
>         .remove =3D wfx_sdio_remove,
>         .drv =3D {
>                 .owner =3D THIS_MODULE,
> -               .of_match_table =3D of_match_ptr(wfx_sdio_of_match),
> +               .of_match_table =3D wfx_sdio_of_match,

... and obviously keep of_match_ptr() here.

>         }
>  };


--=20
J=E9r=F4me Pouiller