| Message ID | 1464358702-19083-2-git-send-email-javier@osg.samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6f49208fec850639f56ed850ab79dbe7f6979221 |
| Delegated to: | Kalle Valo |
| Headers | show |
Hi All, On Sat, May 28, 2016 at 12:18 AM, Javier Martinez Canillas <javier@osg.samsung.com> wrote: > SDIO is an auto enumerable bus so the SDIO devices are matched using the > sdio_device_id table and not using compatible strings from a OF id table. > > However, commit ce4f6f0c353b ("mwifiex: add platform specific wakeup > interrupt support") allowed to match nodes defined as child of the SDIO > host controller in the probe function using a compatible string to setup > platform specific parameters in the DT. > > The problem is that the OF parse function is always called regardless if > the SDIO dev has an OF node associated or not, and prints an error if it > is not found. So, on a platform that doesn't have a node for a SDIO dev, > the following misleading error message will be printed: > > [ 12.480042] mwifiex_sdio mmc2:0001:1: sdio platform data not available > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> This looks sensible to me. Reviewed-by: Julian Calaby <julian.calaby@gmail.com> > drivers/net/wireless/marvell/mwifiex/sdio.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Thanks,
Javier Martinez Canillas <javier@osg.samsung.com> wrote: > SDIO is an auto enumerable bus so the SDIO devices are matched using the > sdio_device_id table and not using compatible strings from a OF id table. > > However, commit ce4f6f0c353b ("mwifiex: add platform specific wakeup > interrupt support") allowed to match nodes defined as child of the SDIO > host controller in the probe function using a compatible string to setup > platform specific parameters in the DT. > > The problem is that the OF parse function is always called regardless if > the SDIO dev has an OF node associated or not, and prints an error if it > is not found. So, on a platform that doesn't have a node for a SDIO dev, > the following misleading error message will be printed: > > [ 12.480042] mwifiex_sdio mmc2:0001:1: sdio platform data not available > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > Reviewed-by: Julian Calaby <julian.calaby@gmail.com> Thanks, 8 patches applied to wireless-drivers-next.git: 6f49208fec85 mwifiex: only call mwifiex_sdio_probe_of() if dev has an OF node cc524d1706b7 mwifiex: propagate sdio_enable_func() errno code in mwifiex_sdio_probe() 032e0f546c7e mwifiex: propagate mwifiex_add_card() errno code in mwifiex_sdio_probe() a82f65aae143 mwifiex: consolidate mwifiex_sdio_probe() error paths d3f04ece53a4 mwifiex: use dev_err() instead of pr_err() in mwifiex_sdio_probe() 213d9421c165 mwifiex: check if mwifiex_sdio_probe_of() fails and return error 806dd220340d mwifiex: don't print an error if an optional DT property is missing 5e94913f676a mwifiex: use better message and error code when OF node doesn't match
diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c index bdc51ffd43ec..285b1b68f7e9 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -102,8 +102,7 @@ static int mwifiex_sdio_probe_of(struct device *dev, struct sdio_mmc_card *card) struct mwifiex_plt_wake_cfg *cfg; int ret; - if (!dev->of_node || - !of_match_node(mwifiex_sdio_of_match_table, dev->of_node)) { + if (!of_match_node(mwifiex_sdio_of_match_table, dev->of_node)) { dev_err(dev, "sdio platform data not available\n"); return -1; } @@ -189,7 +188,8 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id) } /* device tree node parsing and platform specific configuration*/ - mwifiex_sdio_probe_of(&func->dev, card); + if (func->dev.of_node) + mwifiex_sdio_probe_of(&func->dev, card); if (mwifiex_add_card(card, &add_remove_card_sem, &sdio_ops, MWIFIEX_SDIO)) {
SDIO is an auto enumerable bus so the SDIO devices are matched using the sdio_device_id table and not using compatible strings from a OF id table. However, commit ce4f6f0c353b ("mwifiex: add platform specific wakeup interrupt support") allowed to match nodes defined as child of the SDIO host controller in the probe function using a compatible string to setup platform specific parameters in the DT. The problem is that the OF parse function is always called regardless if the SDIO dev has an OF node associated or not, and prints an error if it is not found. So, on a platform that doesn't have a node for a SDIO dev, the following misleading error message will be printed: [ 12.480042] mwifiex_sdio mmc2:0001:1: sdio platform data not available Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> --- drivers/net/wireless/marvell/mwifiex/sdio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)