On Monday 22 May 2006 02:37, Jeff Garzik wrote:
> Alexey Dobriyan wrote:
> > Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
>
> Unless Mark objects, I'll merge this into #upstream (2.6.18) soon.
>
> Jeff
Well, if we're going to use the endian annotation types,
then we may as well mark *all* of the __le* hardware fields,
not just a few of them.
Thus, this extended version of Alexey's original patch:
Signed-off-by: Mark Lord <liml@xxxxxx>
---
--- linux/drivers/scsi/sata_mv.c 2006-05-19 15:59:51.000000000 -0400
+++ linux/drivers/scsi/sata_mv.c 2006-05-22 18:52:37.000000000 -0400
@@ -272,33 +272,33 @@
/* Command ReQuest Block: 32B */
struct mv_crqb {
- u32 sg_addr;
- u32 sg_addr_hi;
- u16 ctrl_flags;
- u16 ata_cmd[11];
+ __u32 sg_addr;
+ __u32 sg_addr_hi;
+ __u16 ctrl_flags;
+ __u16 ata_cmd[11];
};
struct mv_crqb_iie {
- u32 addr;
- u32 addr_hi;
- u32 flags;
- u32 len;
- u32 ata_cmd[4];
+ __u32 addr;
+ __u32 addr_hi;
+ __u32 flags;
+ __u32 len;
+ __u32 ata_cmd[4];
};
/* Command ResPonse Block: 8B */
struct mv_crpb {
- u16 id;
- u16 flags;
- u32 tmstmp;
+ __u16 id;
+ __u16 flags;
+ __u32 tmstmp;
};
/* EDMA Physical Region Descriptor (ePRD); A.K.A. SG */
struct mv_sg {
- u32 addr;
- u32 flags_size;
- u32 addr_hi;
- u32 reserved;
+ __u32 addr;
+ __u32 flags_size;
+ __u32 addr_hi;
+ __u32 reserved;
};
struct mv_port_priv {
@@ -1028,7 +1028,7 @@
return (index + 1) & MV_MAX_Q_DEPTH_MASK;
}
-static inline void mv_crqb_pack_cmd(u16 *cmdw, u8 data, u8 addr, unsigned last)
+static inline void mv_crqb_pack_cmd(__u16 *cmdw, u8 data, u8 addr, unsigned last)
{
u16 tmp = data | (addr << CRQB_CMD_ADDR_SHIFT) | CRQB_CMD_CS |
(last ? CRQB_CMD_LAST : 0);
@@ -1051,7 +1051,7 @@
{
struct ata_port *ap = qc->ap;
struct mv_port_priv *pp = ap->private_data;
- u16 *cw;
+ __u16 *cw;
struct ata_taskfile *tf;
u16 flags = 0;
unsigned in_index;
-
: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
