Patchwork [U-Boot,v1,05/25] spi: kirkwood_spi.c: cosmetic: Fix minor coding style issues

login
register
mail settings
Submitter Stefan Roese
Date June 27, 2014, 9:54 a.m.
Message ID <1403862911-6138-6-git-send-email-sr@denx.de>
Download mbox | patch
Permalink /patch/364834/
State Accepted
Delegated to: Jagannadha Sutradharudu Teki
Headers show

Comments

Stefan Roese - June 27, 2014, 9:54 a.m.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---

 drivers/spi/kirkwood_spi.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
Jagannadha Sutradharudu Teki - July 3, 2014, 8:18 p.m.
Reviewed-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>

On Fri, Jun 27, 2014 at 3:24 PM, Stefan Roese <sr@denx.de> wrote:
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
> ---
>
>  drivers/spi/kirkwood_spi.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
> index 7d1c1f9..3d58bcc 100644
> --- a/drivers/spi/kirkwood_spi.c
> +++ b/drivers/spi/kirkwood_spi.c
> @@ -46,7 +46,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
>
>         /* program spi clock prescaller using max_hz */
>         writel(KWSPI_ADRLEN_3BYTE | data, &spireg->cfg);
> -       debug("data = 0x%08x \n", data);
> +       debug("data = 0x%08x\n", data);
>
>         writel(KWSPI_SMEMRDIRQ, &spireg->irq_cause);
>         writel(KWSPI_IRQMASK, &spireg->irq_mask);
> @@ -100,7 +100,6 @@ int spi_claim_bus(struct spi_slave *slave)
>
>         /* set new spi mpp and save current mpp config */
>         kirkwood_mpp_conf(spi_mpp_config, spi_mpp_backup);
> -
>  #endif
>
>         return board_spi_claim_bus(slave);
> @@ -127,7 +126,7 @@ void spi_release_bus(struct spi_slave *slave)
>   */
>  int spi_cs_is_valid(unsigned int bus, unsigned int cs)
>  {
> -       return (bus == 0 && (cs == 0 || cs == 1));
> +       return bus == 0 && (cs == 0 || cs == 1);
>  }
>  #endif
>
> @@ -169,7 +168,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
>
>                 /* Shift data so it's msb-justified */
>                 if (dout)
> -                       tmpdout = *(u32 *) dout & 0x0ff;
> +                       tmpdout = *(u32 *)dout & 0xff;
>
>                 clrbits_le32(&spireg->irq_cause, KWSPI_SMEMRDIRQ);
>                 writel(tmpdout, &spireg->dout); /* Write the data out */
> @@ -185,12 +184,11 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
>                         if (readl(&spireg->irq_cause) & KWSPI_SMEMRDIRQ) {
>                                 isread = 1;
>                                 tmpdin = readl(&spireg->din);
> -                               debug
> -                                       ("spi_xfer: din %p..%08x read\n",
> -                                       din, tmpdin);
> +                               debug("spi_xfer: din %p..%08x read\n",
> +                                     din, tmpdin);
>
>                                 if (din) {
> -                                       *((u8 *) din) = (u8) tmpdin;
> +                                       *((u8 *)din) = (u8)tmpdin;
>                                         din += 1;
>                                 }
>                                 if (dout)
> --
> 2.0.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

Patch

diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index 7d1c1f9..3d58bcc 100644
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -46,7 +46,7 @@  struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 
 	/* program spi clock prescaller using max_hz */
 	writel(KWSPI_ADRLEN_3BYTE | data, &spireg->cfg);
-	debug("data = 0x%08x \n", data);
+	debug("data = 0x%08x\n", data);
 
 	writel(KWSPI_SMEMRDIRQ, &spireg->irq_cause);
 	writel(KWSPI_IRQMASK, &spireg->irq_mask);
@@ -100,7 +100,6 @@  int spi_claim_bus(struct spi_slave *slave)
 
 	/* set new spi mpp and save current mpp config */
 	kirkwood_mpp_conf(spi_mpp_config, spi_mpp_backup);
-
 #endif
 
 	return board_spi_claim_bus(slave);
@@ -127,7 +126,7 @@  void spi_release_bus(struct spi_slave *slave)
  */
 int spi_cs_is_valid(unsigned int bus, unsigned int cs)
 {
-	return (bus == 0 && (cs == 0 || cs == 1));
+	return bus == 0 && (cs == 0 || cs == 1);
 }
 #endif
 
@@ -169,7 +168,7 @@  int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
 
 		/* Shift data so it's msb-justified */
 		if (dout)
-			tmpdout = *(u32 *) dout & 0x0ff;
+			tmpdout = *(u32 *)dout & 0xff;
 
 		clrbits_le32(&spireg->irq_cause, KWSPI_SMEMRDIRQ);
 		writel(tmpdout, &spireg->dout);	/* Write the data out */
@@ -185,12 +184,11 @@  int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
 			if (readl(&spireg->irq_cause) & KWSPI_SMEMRDIRQ) {
 				isread = 1;
 				tmpdin = readl(&spireg->din);
-				debug
-					("spi_xfer: din %p..%08x read\n",
-					din, tmpdin);
+				debug("spi_xfer: din %p..%08x read\n",
+				      din, tmpdin);
 
 				if (din) {
-					*((u8 *) din) = (u8) tmpdin;
+					*((u8 *)din) = (u8)tmpdin;
 					din += 1;
 				}
 				if (dout)