Re: [PATCH v6 068/102] spi: ich: Various small tidy-ups

[Bin Meng]

On Sat, Dec 7, 2019 at 12:51 PM Simon Glass  wrote:
>
> Use debug() instead of printf() to reduce code size and change a bool
> return value to the use the 'bool' type. Also drop the global data
> declaration since it not actually used. Finally, set the log category.
>
> Signed-off-by: Simon Glass 
> Reviewed-by: Bin Meng 
> ---
>
> Changes in v6: None
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
>
>  drivers/spi/ich.c | 17 -
>  1 file changed, 8 insertions(+), 9 deletions(-)
>

applied to u-boot-x86/next, thanks!

[PATCH v6 068/102] spi: ich: Various small tidy-ups

[Simon Glass]

Use debug() instead of printf() to reduce code size and change a bool
return value to the use the 'bool' type. Also drop the global data
declaration since it not actually used. Finally, set the log category.

Signed-off-by: Simon Glass 
Reviewed-by: Bin Meng 
---

Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 drivers/spi/ich.c | 17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index eeb4c274b8..b83dfb854d 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -5,6 +5,8 @@
  * This file is derived from the flashrom project.
  */
 
+#define LOG_CATEGORY   UCLASS_SPI
+
 #include 
 #include 
 #include 
@@ -19,8 +21,6 @@
 
 #include "ich.h"
 
-DECLARE_GLOBAL_DATA_PTR;
-
 #ifdef DEBUG_TRACE
 #define debug_trace(fmt, args...) debug(fmt, ##args)
 #else
@@ -96,7 +96,7 @@ static void ich_set_bbar(struct ich_spi_priv *ctlr, uint32_t 
minaddr)
 }
 
 /* @return 1 if the SPI flash supports the 33MHz speed */
-static int ich9_can_do_33mhz(struct udevice *dev)
+static bool ich9_can_do_33mhz(struct udevice *dev)
 {
struct ich_spi_priv *priv = dev_get_priv(dev);
u32 fdod, speed;
@@ -173,8 +173,7 @@ static int spi_setup_opcode(struct ich_spi_priv *ctlr, 
struct spi_trans *trans,
}
 
if (opcode_index == ctlr->menubytes) {
-   printf("ICH SPI: Opcode %x not found\n",
-  trans->opcode);
+   debug("ICH SPI: Opcode %x not found\n", trans->opcode);
return -EINVAL;
}
 
@@ -182,8 +181,8 @@ static int spi_setup_opcode(struct ich_spi_priv *ctlr, 
struct spi_trans *trans,
optype = (optypes >> (opcode_index * 2)) & 0x3;
 
if (optype != trans->type) {
-   printf("ICH SPI: Transaction doesn't fit type %d\n",
-  optype);
+   debug("ICH SPI: Transaction doesn't fit type %d\n",
+ optype);
return -ENOSPC;
}
return opcode_index;
@@ -214,9 +213,9 @@ static int ich_status_poll(struct ich_spi_priv *ctlr, u16 
bitmask,
}
udelay(10);
}
+   debug("ICH SPI: SCIP timeout, read %x, expected %x, wts %x %x\n",
+ status, bitmask, wait_til_set, status & bitmask);
 
-   printf("ICH SPI: SCIP timeout, read %x, expected %x\n",
-  status, bitmask);
return -ETIMEDOUT;
 }
 
-- 
2.24.0.393.g34dc348eaf-goog