drivers/block/: sparse fixes

author Kim Phillips <kim.phillips@freescale.com>

Mon, 29 Oct 2012 13:34:40 +0000 (13:34 +0000)

committer Tom Rini <trini@ti.com>

Sun, 4 Nov 2012 18:00:37 +0000 (11:00 -0700)
author Kim Phillips <kim.phillips@freescale.com>
Mon, 29 Oct 2012 13:34:40 +0000 (13:34 +0000)
committer Tom Rini <trini@ti.com>
Sun, 4 Nov 2012 18:00:37 +0000 (11:00 -0700)
diff --git a/drivers/block/fsl_sata.c b/drivers/block/fsl_sata.c

index fda3389e8bf69a1ad6a321f7d499384e3c7b81b7..1f9d7b097c6a0f8737da8fa24fd6222344d3703c 100644 (file)
--- a/drivers/block/fsl_sata.c
+++ b/drivers/block/fsl_sata.c
@@ -56,25 +56,6 @@ static inline void sdelay(unsigned long sec)
                 mdelay(1000);
  }
  
-void dprint_buffer(unsigned char *buf, int len)
-{
-       int i, j;
-
-       i = 0;
-       j = 0;
-       printf("\n\r");
-
-       for (i = 0; i < len; i++) {
-               printf("%02x ", *buf++);
-               j++;
-               if (j == 16) {
-                       printf("\n\r");
-                       j = 0;
-               }
-       }
-       printf("\n\r");
-}
-
  static void fsl_sata_dump_sfis(struct sata_fis_d2h *s)
  {
         printf("Status FIS dump:\n\r");
@@ -94,7 +75,7 @@ static void fsl_sata_dump_sfis(struct sata_fis_d2h *s)
         printf("sector_count_exp:       %02x\n\r", s->sector_count_exp);
  }
  
-static int ata_wait_register(volatile unsigned *addr, u32 mask,
+static int ata_wait_register(unsigned __iomem *addr, u32 mask,
                          u32 val, u32 timeout_msec)
  {
         int i;
@@ -112,7 +93,7 @@ int init_sata(int dev)
         cmd_hdr_tbl_t *cmd_hdr;
         u32 cda;
         u32 val32;
-       fsl_sata_reg_t *reg;
+       fsl_sata_reg_t __iomem *reg;
         u32 sig;
         int i;
         fsl_sata_t *sata;
@@ -287,42 +268,7 @@ int init_sata(int dev)
         return 0;
  }
  
-/* Hardware reset, like Power-on and COMRESET */
-void fsl_sata_hardware_reset(u32 reg_base)
-{
-       fsl_sata_reg_t *reg = (fsl_sata_reg_t *)reg_base;
-       u32 scontrol;
-
-       /* Disable the SATA interface and put PHY offline */
-       scontrol = in_le32(&reg->scontrol);
-       scontrol = (scontrol & 0x0f0) | 0x304;
-       out_le32(&reg->scontrol, scontrol);
-
-       /* No speed strict */
-       scontrol = in_le32(&reg->scontrol);
-       scontrol = scontrol & ~0x0f0;
-       out_le32(&reg->scontrol, scontrol);
-
-       /* Issue PHY wake/reset, Hardware_reset_asserted */
-       scontrol = in_le32(&reg->scontrol);
-       scontrol = (scontrol & 0x0f0) | 0x301;
-       out_le32(&reg->scontrol, scontrol);
-
-       mdelay(100);
-
-       /* Resume PHY, COMRESET negated, the device initialize hardware
-        * and execute diagnostics, send good status-signature to host,
-        * which is D2H register FIS, and then the device enter idle state.
-        */
-       scontrol = in_le32(&reg->scontrol);
-       scontrol = (scontrol & 0x0f0) | 0x300;
-       out_le32(&reg->scontrol, scontrol);
-
-       mdelay(100);
-       return;
-}
-
-static void fsl_sata_dump_regs(fsl_sata_reg_t *reg)
+static void fsl_sata_dump_regs(fsl_sata_reg_t __iomem *reg)
  {
         printf("\n\rSATA:           %08x\n\r", (u32)reg);
         printf("CQR:            %08x\n\r", in_le32(&reg->cqr));
@@ -363,7 +309,7 @@ static int fsl_ata_exec_ata_cmd(struct fsl_sata *sata, struct sata_fis_h2d *cfis
         u32 prde_count;
         u32 val32;
         u32 ttl;
-       fsl_sata_reg_t *reg = sata->reg_base;
+       fsl_sata_reg_t __iomem *reg = sata->reg_base;
         int i;
  
         /* Check xfer length */
@@ -620,7 +566,7 @@ static u32 fsl_sata_rw_cmd(int dev, u32 start, u32 blkcnt, u8 *buffer, int is_wr
         return blkcnt;
  }
  
-void fsl_sata_flush_cache(int dev)
+static void fsl_sata_flush_cache(int dev)
  {
         fsl_sata_t *sata = (fsl_sata_t *)sata_dev_desc[dev].priv;
         struct sata_fis_h2d h2d, *cfis = &h2d;
@@ -664,7 +610,8 @@ static u32 fsl_sata_rw_cmd_ext(int dev, u32 start, u32 blkcnt, u8 *buffer, int i
         return blkcnt;
  }
  
-u32 fsl_sata_rw_ncq_cmd(int dev, u32 start, u32 blkcnt, u8 *buffer, int is_write)
+static u32 fsl_sata_rw_ncq_cmd(int dev, u32 start, u32 blkcnt, u8 *buffer,
+                              int is_write)
  {
         fsl_sata_t *sata = (fsl_sata_t *)sata_dev_desc[dev].priv;
         struct sata_fis_h2d h2d, *cfis = &h2d;
@@ -707,7 +654,7 @@ u32 fsl_sata_rw_ncq_cmd(int dev, u32 start, u32 blkcnt, u8 *buffer, int is_write
         return blkcnt;
  }
  
-void fsl_sata_flush_cache_ext(int dev)
+static void fsl_sata_flush_cache_ext(int dev)
  {
         fsl_sata_t *sata = (fsl_sata_t *)sata_dev_desc[dev].priv;
         struct sata_fis_h2d h2d, *cfis = &h2d;
@@ -721,12 +668,6 @@ void fsl_sata_flush_cache_ext(int dev)
         fsl_sata_exec_cmd(sata, cfis, CMD_ATA, 0, NULL, 0);
  }
  
-/* Software reset, set SRST of the Device Control register */
-void fsl_sata_software_reset(int dev)
-{
-       return;
-}
-
  static void fsl_sata_init_wcache(int dev, u16 *id)
  {
         fsl_sata_t *sata = (fsl_sata_t *)sata_dev_desc[dev].priv;
@@ -757,7 +698,7 @@ static int fsl_sata_get_flush_ext(int dev)
         return sata->flush_ext;
  }
  
-u32 ata_low_level_rw_lba48(int dev, u32 blknr, lbaint_t blkcnt,
+static u32 ata_low_level_rw_lba48(int dev, u32 blknr, lbaint_t blkcnt,
                 const void *buffer, int is_write)
  {
         u32 start, blks;
@@ -792,8 +733,8 @@ u32 ata_low_level_rw_lba48(int dev, u32 blknr, lbaint_t blkcnt,
         return blkcnt;
  }
  
-u32 ata_low_level_rw_lba28(int dev, u32 blknr, u32 blkcnt, const void *buffer,
-               int is_write)
+static u32 ata_low_level_rw_lba28(int dev, u32 blknr, u32 blkcnt,
+                                 const void *buffer, int is_write)
  {
         u32 start, blks;
         u8 *addr;
diff --git a/drivers/block/fsl_sata.h b/drivers/block/fsl_sata.h

index cecff68da3500430a1f6df6af16e62c99dbaf596..a9c27bc86885e38d8ee943f82bc7ef13dedf496a 100644 (file)
--- a/drivers/block/fsl_sata.h
+++ b/drivers/block/fsl_sata.h
@@ -176,10 +176,11 @@ typedef struct fsl_sata_reg {
  * Command Header Entry
  */
  typedef struct cmd_hdr_entry {
-       u32 cda;                /* Command Descriptor Address, 4 bytes aligned */
-       u32 prde_fis_len;       /* Number of PRD entries and FIS length */
-       u32 ttl;                /* Total transfer length */
-       u32 attribute;          /* the attribute of command */
+       __le32 cda;             /* Command Descriptor Address,
+                                  4 bytes aligned */
+       __le32 prde_fis_len;    /* Number of PRD entries and FIS length */
+       __le32 ttl;             /* Total transfer length */
+       __le32 attribute;       /* the attribute of command */
  } __attribute__ ((packed)) cmd_hdr_entry_t;
  
  #define SATA_HC_CMD_HDR_ENTRY_SIZE     sizeof(struct cmd_hdr_entry)
@@ -230,10 +231,10 @@ typedef struct cmd_hdr_tbl {
  * PRD entry - Physical Region Descriptor entry
  */
  typedef struct prd_entry {
-       u32 dba;        /* Data base address, 4 bytes aligned */
+       __le32 dba;     /* Data base address, 4 bytes aligned */
         u32 res1;
         u32 res2;
-       u32 ext_c_ddc;  /* Indirect PRD flags, snoop and data word count */
+       __le32 ext_c_ddc; /* Indirect PRD flags, snoop and data word count */
  } __attribute__ ((packed)) prd_entry_t;
  
  #define SATA_HC_CMD_DESC_PRD_SIZE      sizeof(struct prd_entry)
diff --git a/drivers/block/sata_sil.c b/drivers/block/sata_sil.c

index 245b872f993942ae02958f5563bc7475f504f83b..b70f04de8b983da916cafa309ef9d6c04a6458bd 100644 (file)
--- a/drivers/block/sata_sil.c
+++ b/drivers/block/sata_sil.c
@@ -27,6 +27,7 @@
  #include <fis.h>
  #include <sata.h>
  #include <libata.h>
+#include <sata.h>
  #include "sata_sil.h"
  
  /* Convert sectorsize to wordsize */
@@ -369,8 +370,8 @@ static ulong sil_sata_rw_cmd_ext(int dev, ulong start, ulong blkcnt,
         return blkcnt;
  }
  
-ulong sil_sata_rw_lba28(int dev, ulong blknr, lbaint_t blkcnt,
-               const void *buffer, int is_write)
+static ulong sil_sata_rw_lba28(int dev, ulong blknr, lbaint_t blkcnt,
+                              const void *buffer, int is_write)
  {
         ulong start, blks, max_blks;
         u8 *addr;
@@ -397,8 +398,8 @@ ulong sil_sata_rw_lba28(int dev, ulong blknr, lbaint_t blkcnt,
         return blkcnt;
  }
  
-ulong sil_sata_rw_lba48(int dev, ulong blknr, lbaint_t blkcnt,
-               const void *buffer, int is_write)
+static ulong sil_sata_rw_lba48(int dev, ulong blknr, lbaint_t blkcnt,
+                              const void *buffer, int is_write)
  {
         ulong start, blks, max_blks;
         u8 *addr;
@@ -427,7 +428,7 @@ ulong sil_sata_rw_lba48(int dev, ulong blknr, lbaint_t blkcnt,
         return blkcnt;
  }
  
-void sil_sata_cmd_flush_cache(int dev)
+static void sil_sata_cmd_flush_cache(int dev)
  {
         struct sil_cmd_block cmdb, *pcmd = &cmdb;
  
@@ -439,7 +440,7 @@ void sil_sata_cmd_flush_cache(int dev)
         sil_exec_cmd(dev, pcmd, 0);
  }
  
-void sil_sata_cmd_flush_cache_ext(int dev)
+static void sil_sata_cmd_flush_cache_ext(int dev)
  {
         struct sil_cmd_block cmdb, *pcmd = &cmdb;
author	Kim Phillips <kim.phillips@freescale.com>
	Mon, 29 Oct 2012 13:34:40 +0000 (13:34 +0000)
committer	Tom Rini <trini@ti.com>
	Sun, 4 Nov 2012 18:00:37 +0000 (11:00 -0700)
drivers/block/fsl_sata.c		patch \| blob \| history
drivers/block/fsl_sata.h		patch \| blob \| history
drivers/block/sata_sil.c		patch \| blob \| history