From 7450bbc86d4f123b1860eafbaf8caa4123331925 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Mon, 14 Aug 2023 08:26:53 +0200 Subject: [PATCH 062/480] cw1200: Improve error reporting from probe Signed-off-by: Ondrej Jirman --- drivers/net/wireless/st/cw1200/cw1200_sdio.c | 22 +++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/st/cw1200/cw1200_sdio.c b/drivers/net/wireless/st/cw1200/cw1200_sdio.c index 774eb798ff46..dbb82f91ab53 100644 --- a/drivers/net/wireless/st/cw1200/cw1200_sdio.c +++ b/drivers/net/wireless/st/cw1200/cw1200_sdio.c @@ -293,7 +293,7 @@ static const struct of_device_id xradio_sdio_of_match_table[] = { { } }; -static int cw1200_probe_of(struct sdio_func *func) +static int cw1200_probe_of(struct sdio_func *func, struct hwbus_priv *self) { struct device *dev = &func->dev; struct device_node *np = dev->of_node; @@ -302,12 +302,14 @@ static int cw1200_probe_of(struct sdio_func *func) int irq; of_id = of_match_node(xradio_sdio_of_match_table, np); - if (!of_id) + if (!of_id) { + dev_warn(dev, "OF device match failed\n"); return -ENODEV; + } irq = irq_of_parse_and_map(np, 0); if (!irq) { - pr_warn("SDIO: No irq in platform data\n"); + dev_warn(dev, "No irq in platform data\n"); } else { global_plat_data->irq = irq; } @@ -316,9 +318,10 @@ static int cw1200_probe_of(struct sdio_func *func) if (!macaddr) return -ENOMEM; - if (!of_get_mac_address(np, macaddr)) + if (!of_get_mac_address(np, macaddr)) { + dev_warn(dev, "Found MAC address in OF: %pM\n", macaddr); global_plat_data->macaddr = macaddr; - else + } else kfree(macaddr); return 0; @@ -338,14 +341,14 @@ static int cw1200_sdio_probe(struct sdio_func *func, if (func->num != 0x01) return -ENODEV; - cw1200_probe_of(func); - self = devm_kzalloc(dev, sizeof(*self), GFP_KERNEL); if (!self) { pr_err("Can't allocate SDIO hwbus_priv.\n"); return -ENOMEM; } + cw1200_probe_of(func, self); + func->card->quirks |= MMC_QUIRK_LENIENT_FN0; func->card->quirks |= MMC_QUIRK_BROKEN_BYTE_MODE_512; @@ -356,11 +359,14 @@ static int cw1200_sdio_probe(struct sdio_func *func, self->wakeup_device_gpio = devm_gpiod_get_optional(dev, "device-wakeup", GPIOD_OUT_LOW); if (IS_ERR(self->wakeup_device_gpio)) - return dev_err_probe(dev, PTR_ERR(self->wakeup_device_gpio), "can't get wakeup gpio"); + return dev_err_probe(dev, PTR_ERR(self->wakeup_device_gpio), + "can't get device-wakeup gpio\n"); if (self->wakeup_device_gpio) { gpiod_direction_output(self->wakeup_device_gpio, 1); msleep(10); + } else { + dev_warn(dev, "device-wakeup GPIO not found\n"); } self->pdata = global_plat_data; /* FIXME */ -- 2.49.0