nand: brcmnand: Fix not calling dev_err() with a device

There are too many levels of indirection when calling dev_err. This is an
artifact of the conversion of brcmnand_host.pdev from a struct
platform_device (which has a member `dev` pointing to a struct device) to
struct udevice.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Tested-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 48c0ca69de55b8771822e1c313d22ffd7d1c3cd4..7349a9bc99e9d0c522fe36160a1f1949c769e275 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -956,7 +956,7 @@ static struct nand_ecclayout *brcmnand_create_layout(int ecc_level,
         */
        req = DIV_ROUND_UP(ecc_level * 14, 8);
        if (req >= sas) {
-               dev_err(&host->pdev->dev,
+               dev_err(host->pdev,
                        "error: ECC too large for OOB (ECC bytes %d, spare sector %d)\n",
                        req, sas);
                return NULL;
@@ -1012,8 +1012,8 @@ static struct nand_ecclayout *brcmstb_choose_ecc_layout(
 
        layout = brcmnand_create_layout(ecc_level, host);
        if (!layout) {
-               dev_err(&host->pdev->dev,
-                               "no proper ecc_layout for this NAND cfg\n");
+               dev_err(host->pdev,
+                       "no proper ecc_layout for this NAND cfg\n");
                return NULL;
        }
 
@@ -1056,17 +1056,9 @@ static void brcmnand_wp(struct mtd_info *mtd, int wp)
                                               NAND_CTRL_RDY |
                                               NAND_STATUS_READY |
                                               (wp ? 0 : NAND_STATUS_WP), 0);
-#ifndef __UBOOT__
-               if (ret)
-                       dev_err_ratelimited(&host->pdev->dev,
-                                           "nand #WP expected %s\n",
-                                           wp ? "on" : "off");
-#else
                if (ret)
-                       dev_err(&host->pdev->dev,
-                                           "nand #WP expected %s\n",
-                                           wp ? "on" : "off");
-#endif /* __UBOOT__ */
+                       dev_err(host->pdev, "nand #WP expected %s\n",
+                               wp ? "on" : "off");
        }
 }
 
@@ -2257,7 +2249,7 @@ static int brcmnand_init_cs(struct brcmnand_host *host, ofnode dn)
        ret = ofnode_read_s32(dn, "reg", &host->cs);
 #endif
        if (ret) {
-               dev_err(&pdev->dev, "can't get chip-select\n");
+               dev_err(pdev, "can't get chip-select\n");
                return -ENXIO;
        }