leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: ich: Various small tidy-ups

Browse Source 
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 <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2019-12-06 21:42:41 -07:00 committed by Bin Meng
parent b47aa26eb9
commit a550662c27
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/spi/ich.c
View File

@ -5,6 +5,8 @@
* This file is derived from the flashrom project. * This file is derived from the flashrom project.
*/ */
#define LOG_CATEGORY UCLASS_SPI
#include <common.h> #include <common.h>
#include <div64.h> #include <div64.h>
#include <dm.h> #include <dm.h>
@ -19,8 +21,6 @@
#include "ich.h" #include "ich.h"
DECLARE_GLOBAL_DATA_PTR;
#ifdef DEBUG_TRACE #ifdef DEBUG_TRACE
#define debug_trace(fmt, args...) debug(fmt, ##args) #define debug_trace(fmt, args...) debug(fmt, ##args)
#else #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 */ /* @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); struct ich_spi_priv *priv = dev_get_priv(dev);
u32 fdod, speed; 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) { if (opcode_index == ctlr->menubytes) {
printf("ICH SPI: Opcode %x not found\n", debug("ICH SPI: Opcode %x not found\n", trans->opcode);
trans->opcode);
return -EINVAL; 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; optype = (optypes >> (opcode_index * 2)) & 0x3;
if (optype != trans->type) { if (optype != trans->type) {
printf("ICH SPI: Transaction doesn't fit type %d\n", debug("ICH SPI: Transaction doesn't fit type %d\n",
optype); optype);
return -ENOSPC; return -ENOSPC;
} }
return opcode_index; return opcode_index;
@ -214,9 +213,9 @@ static int ich_status_poll(struct ich_spi_priv *ctlr, u16 bitmask,
} }
udelay(10); 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; return -ETIMEDOUT;
} }