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

Commit 1309d4e6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  ata: fix sparse warning in pata_acpi.c
  ata: fix sparse warning in pata_marvell.c
  ata: fix sparse warning in pata_jmicron.c
  ata: fix sparse warning in pata_cs5536.c
  ata: sparse fixes for pata_amd.c
  pata_scc.c: add thaw ops
  pata_cs5536.c bugfix
  pata_legacy: don't call ata_host_detach() after initialization failure
  ata: fix sparse warnings in sata_mv.c
  ata: fix sparse warning in sata_via.c
  ata: fix sparse warning in sata_promise.c
  ata: fix sparse warning in ata_piix.c
  ata: fix sparse warning in libata-core.c
  ata: make ata_scsiop_inq_89 static in libata-scsi.c
parents 101142c3 5410f729

drivers/ata/ata_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -1652,7 +1652,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev, 
		u8 tmp;

		pci_read_config_byte(pdev, PIIX_SCC, &tmp);

		if (tmp == PIIX_AHCI_DEVICE) {

			int rc = piix_disable_ahci(pdev);

			rc = piix_disable_ahci(pdev);

			if (rc)

				return rc;

		}

drivers/ata/libata-core.c

+0 −1
Original line number Diff line number Diff line
@@ -7086,7 +7086,6 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) 
	DPRINTK("probe begin\n");

	for (i = 0; i < host->n_ports; i++) {

		struct ata_port *ap = host->ports[i];

		int rc;



		/* probe */

		if (ap->ops->error_handler) {

drivers/ata/libata-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1862,7 +1862,7 @@ unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf, 
 *	spin_lock_irqsave(host lock)

 */



unsigned int ata_scsiop_inq_89(struct ata_scsi_args *args, u8 *rbuf,

static unsigned int ata_scsiop_inq_89(struct ata_scsi_args *args, u8 *rbuf,

			      unsigned int buflen)

{

	u8 pbuf[60];

drivers/ata/pata_acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ static int pacpi_cable_detect(struct ata_port *ap) 


static void pacpi_error_handler(struct ata_port *ap)

{

	return ata_bmdma_drive_eh(ap, pacpi_pre_reset, ata_std_softreset,

				  NULL, ata_std_postreset);

	ata_bmdma_drive_eh(ap, pacpi_pre_reset, ata_std_softreset, NULL,

			   ata_std_postreset);

}



/**

drivers/ata/pata_amd.c

+2 −5
Original line number Diff line number Diff line
@@ -146,8 +146,7 @@ static int amd_pre_reset(struct ata_link *link, unsigned long deadline) 


static void amd_error_handler(struct ata_port *ap)

{

	return ata_bmdma_drive_eh(ap, amd_pre_reset,

				      ata_std_softreset, NULL,

	ata_bmdma_drive_eh(ap, amd_pre_reset, ata_std_softreset, NULL,

			   ata_std_postreset);

}
@@ -506,7 +505,6 @@ static struct ata_port_operations amd133_port_ops = { 
static struct ata_port_operations nv100_port_ops = {

	.set_piomode	= nv100_set_piomode,

	.set_dmamode	= nv100_set_dmamode,

	.mode_filter	= ata_pci_default_filter,

	.tf_load	= ata_tf_load,

	.tf_read	= ata_tf_read,

	.check_status 	= ata_check_status,
@@ -541,7 +539,6 @@ static struct ata_port_operations nv100_port_ops = { 
static struct ata_port_operations nv133_port_ops = {

	.set_piomode	= nv133_set_piomode,

	.set_dmamode	= nv133_set_dmamode,

	.mode_filter	= ata_pci_default_filter,

	.tf_load	= ata_tf_load,

	.tf_read	= ata_tf_read,

	.check_status 	= ata_check_status,