Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0938e758 authored Jan 15, 2008 by Linus Torvalds

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: correct handling of TSS DVD
  [libata] core checkpatch fix
  [libata] pata_bf54x: checkpatch fixes
  libata fixes for sparse-found problems

parents 7d2284b0 121a09e5

drivers/ata/libata-core.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6998,7 +6998,9 @@ int ata_host_start(struct ata_host *host)
	rc = ap->ops->port_start(ap);		rc = ap->ops->port_start(ap);
	if (rc) {		if (rc) {
	if (rc != -ENODEV)		if (rc != -ENODEV)
	dev_printk(KERN_ERR, host->dev, "failed to start port %d (errno=%d)\n", i, rc);		dev_printk(KERN_ERR, host->dev,
			"failed to start port %d "
			"(errno=%d)\n", i, rc);
	goto err_out;		goto err_out;
	}		}
	}		}

drivers/ata/pata_bf54x.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1509,7 +1509,8 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev)
	if (res == NULL)		if (res == NULL)
	return -EINVAL;		return -EINVAL;

	while (bfin_port_info[board_idx].udma_mask>0 && udma_fsclk[udma_mode] > fsclk) {		while (bfin_port_info[board_idx].udma_mask > 0 &&
			udma_fsclk[udma_mode] > fsclk) {
	udma_mode--;		udma_mode--;
	bfin_port_info[board_idx].udma_mask >>= 1;		bfin_port_info[board_idx].udma_mask >>= 1;
	}		}

drivers/ata/pata_legacy.c

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -271,14 +271,12 @@ static void pdc_data_xfer_vlb(struct ata_device adev, unsigned char buf, unsig
	ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);		ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);

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

drivers/ata/pata_qdi.c

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -136,14 +136,12 @@ static void qdi_data_xfer(struct ata_device adev, unsigned char buf, unsigned
	ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);		ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);

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

drivers/ata/pata_winbond.c

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -104,14 +104,12 @@ static void winbond_data_xfer(struct ata_device adev, unsigned char buf, unsig
	ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);		ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);

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