ata: endianness annotations in pata drivers (6ad67403) · Commits · 戴 / test

drivers/ata/pata_qdi.c:142:9: warning: incorrect type in assignment (different base types) drivers/ata/pata_qdi.c:142:9: expected unsigned int [unsigned] [usertype] pad drivers/ata/pata_qdi.c:142:9: got restricted __le32 [usertype] <noident> drivers/ata/pata_qdi.c:146:15: warning: cast to restricted __le32 drivers/ata/pata_winbond.c:110:9: warning: incorrect type in assignment (different base types) drivers/ata/pata_winbond.c:110:9: expected unsigned int [unsigned] [usertype] pad drivers/ata/pata_winbond.c:110:9: got restricted __le32 [usertype] <noident> drivers/ata/pata_winbond.c:114:15: warning: cast to restricted __le32 drivers/ata/pata_legacy.c:310:9: warning: incorrect type in assignment (different base types) drivers/ata/pata_legacy.c:310:9: expected unsigned int [unsigned] [usertype] pad drivers/ata/pata_legacy.c:310:9: got restricted __le32 [usertype] <noident> drivers/ata/pata_legacy.c:314:15: warning: cast to restricted __le32 drivers/ata/pata_legacy.c:752:11: warning: cast to restricted __le32 drivers/ata/pata_legacy.c:756:9: warning: incorrect type in assignment (different base types) drivers/ata/pata_legacy.c:756:9: expected unsigned int [unsigned] [addressable] [assigned] [usertype] pad drivers/ata/pata_legacy.c:756:9: got restricted __le32 [usertype] <noident> Signed-off-by:

Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by:

Jeff Garzik <jgarzik@redhat.com>

drivers/ata/pata_legacy.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -305,7 +305,7 @@ static unsigned int pdc_data_xfer_vlb(struct ata_device *dev,
		iowrite32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);

		if (unlikely(slop)) {
		u32 pad;
		__le32 pad;
		if (rw == READ) {
		pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
		memcpy(buf + buflen - slop, &pad, slop);
		@@ -746,14 +746,12 @@ static unsigned int vlb32_data_xfer(struct ata_device adev, unsigned char buf,
		ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);

		if (unlikely(slop)) {
		u32 pad;
		__le32 pad;
		if (rw == WRITE) {
		memcpy(&pad, buf + buflen - slop, slop);
		pad = le32_to_cpu(pad);
		iowrite32(pad, ap->ioaddr.data_addr);
		iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
		} else {
		pad = ioread32(ap->ioaddr.data_addr);
		pad = cpu_to_le32(pad);
		pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
		memcpy(buf + buflen - slop, &pad, slop);
		}
		}

drivers/ata/pata_qdi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@ static unsigned int qdi_data_xfer(struct ata_device dev, unsigned char buf,
		iowrite32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);

		if (unlikely(slop)) {
		u32 pad;
		__le32 pad;
		if (rw == READ) {
		pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
		memcpy(buf + buflen - slop, &pad, slop);

drivers/ata/pata_winbond.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ static unsigned int winbond_data_xfer(struct ata_device *dev,
		iowrite32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);

		if (unlikely(slop)) {
		u32 pad;
		__le32 pad;
		if (rw == READ) {
		pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
		memcpy(buf + buflen - slop, &pad, slop);

Admin message