Commit 4ca4e439 authored by Al Viro's avatar Al Viro Committed by Jeff Garzik
Browse files

libata annotations and fixes 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 35a10a80

drivers/ata/ahci.c

+9 −9
Original line number Diff line number Diff line
@@ -198,18 +198,18 @@ enum { 
};



struct ahci_cmd_hdr {

	u32			opts;

	u32			status;

	u32			tbl_addr;

	u32			tbl_addr_hi;

	u32			reserved[4];

	__le32			opts;

	__le32			status;

	__le32			tbl_addr;

	__le32			tbl_addr_hi;

	__le32			reserved[4];

};



struct ahci_sg {

	u32			addr;

	u32			addr_hi;

	u32			reserved;

	u32			flags_size;

	__le32			addr;

	__le32			addr_hi;

	__le32			reserved;

	__le32			flags_size;

};



struct ahci_host_priv {

drivers/ata/libata-core.c

+1 −1
Original line number Diff line number Diff line
@@ -4949,7 +4949,7 @@ unsigned int ata_data_xfer(struct ata_device *dev, unsigned char *buf, 


	/* Transfer trailing 1 byte, if any. */

	if (unlikely(buflen & 0x01)) {

		u16 align_buf[1] = { 0 };

		__le16 align_buf[1] = { 0 };

		unsigned char *trailing_buf = buf + buflen - 1;



		if (rw == READ) {

drivers/ata/libata-scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -2210,7 +2210,7 @@ unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf, 


		/* sector size */

		ATA_SCSI_RBUF_SET(6, ATA_SECT_SIZE >> 8);

		ATA_SCSI_RBUF_SET(7, ATA_SECT_SIZE);

		ATA_SCSI_RBUF_SET(7, ATA_SECT_SIZE & 0xff);

	} else {

		/* sector count, 64-bit */

		ATA_SCSI_RBUF_SET(0, last_lba >> (8 * 7));
@@ -2224,7 +2224,7 @@ unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf, 


		/* sector size */

		ATA_SCSI_RBUF_SET(10, ATA_SECT_SIZE >> 8);

		ATA_SCSI_RBUF_SET(11, ATA_SECT_SIZE);

		ATA_SCSI_RBUF_SET(11, ATA_SECT_SIZE & 0xff);

	}



	return 0;

drivers/ata/pata_cs5520.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi 
	};

	const struct ata_port_info *ppi[2];

	u8 pcicfg;

	void *iomap[5];

	void __iomem *iomap[5];

	struct ata_host *host;

	struct ata_ioports *ioaddr;

	int i, rc;

drivers/ata/pata_pdc2027x.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static unsigned long pdc2027x_mode_filter(struct ata_device *adev, unsigned long 
	ata_id_c_string(pair->id, model_num, ATA_ID_PROD,

			  ATA_ID_PROD_LEN + 1);

	/* If the master is a maxtor in UDMA6 then the slave should not use UDMA 6 */

	if (strstr(model_num, "Maxtor") == 0 && pair->dma_mode == XFER_UDMA_6)

	if (strstr(model_num, "Maxtor") == NULL && pair->dma_mode == XFER_UDMA_6)

		mask &= ~ (1 << (6 + ATA_SHIFT_UDMA));



	return ata_pci_default_filter(adev, mask);