| Message ID | 20220216093112.92469-2-Jerome.Pouiller@silabs.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | staging: wfx: apply SDIO suggestions | expand |
On Wednesday 16 February 2022 10:31:11 Jerome Pouiller wrote: > From: Jérôme Pouiller <jerome.pouiller@silabs.com> > > Some may think that SDIO_VENDOR_ID_SILABS / SDIO_DEVICE_ID_SILABS_WF200 > are official SDIO IDs. However, it is not the case, the values used by > WF200 are not official (BTW, the driver rely on the DT rather than on > the SDIO IDs to probe the device). > > To avoid any confusion, remove the definitions SDIO_*_ID_SILABS* and use > raw values. > > Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> Reviewed-by: Pali Rohár <pali@kernel.org> > --- > drivers/staging/wfx/bus_sdio.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c > index bc3df85a05b6..312d2d391a24 100644 > --- a/drivers/staging/wfx/bus_sdio.c > +++ b/drivers/staging/wfx/bus_sdio.c > @@ -257,10 +257,9 @@ static void wfx_sdio_remove(struct sdio_func *func) > sdio_release_host(func); > } > > -#define SDIO_VENDOR_ID_SILABS 0x0000 > -#define SDIO_DEVICE_ID_SILABS_WF200 0x1000 > static const struct sdio_device_id wfx_sdio_ids[] = { > - { SDIO_DEVICE(SDIO_VENDOR_ID_SILABS, SDIO_DEVICE_ID_SILABS_WF200) }, > + /* WF200 does not have official VID/PID */ > + { SDIO_DEVICE(0x0000, 0x1000) }, > { }, > }; > MODULE_DEVICE_TABLE(sdio, wfx_sdio_ids); > -- > 2.34.1 >
diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c index bc3df85a05b6..312d2d391a24 100644 --- a/drivers/staging/wfx/bus_sdio.c +++ b/drivers/staging/wfx/bus_sdio.c @@ -257,10 +257,9 @@ static void wfx_sdio_remove(struct sdio_func *func) sdio_release_host(func); } -#define SDIO_VENDOR_ID_SILABS 0x0000 -#define SDIO_DEVICE_ID_SILABS_WF200 0x1000 static const struct sdio_device_id wfx_sdio_ids[] = { - { SDIO_DEVICE(SDIO_VENDOR_ID_SILABS, SDIO_DEVICE_ID_SILABS_WF200) }, + /* WF200 does not have official VID/PID */ + { SDIO_DEVICE(0x0000, 0x1000) }, { }, }; MODULE_DEVICE_TABLE(sdio, wfx_sdio_ids);