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

Commit b4d28889 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'tmp'

parents 7dfb869c 041c5fc3

drivers/scsi/ahci.c

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ struct ahci_port_priv { 
static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg);

static void ahci_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);

static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);

static int ahci_qc_issue(struct ata_queued_cmd *qc);

static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc);

static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *regs);

static void ahci_phy_reset(struct ata_port *ap);

static void ahci_irq_clear(struct ata_port *ap);
@@ -800,7 +800,7 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs * 
	return IRQ_RETVAL(handled);

}



static int ahci_qc_issue(struct ata_queued_cmd *qc)

static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;

	void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;

drivers/scsi/libata-core.c

+8 −9
Original line number Diff line number Diff line
@@ -1126,10 +1126,9 @@ ata_exec_internal(struct ata_port *ap, struct ata_device *dev, 
	qc->private_data = &wait;

	qc->complete_fn = ata_qc_complete_internal;



	if (ata_qc_issue(qc)) {

		qc->err_mask = AC_ERR_OTHER;

	qc->err_mask = ata_qc_issue(qc);

	if (qc->err_mask)

		ata_qc_complete(qc);

	}



	spin_unlock_irqrestore(&ap->host_set->lock, flags);
@@ -3860,10 +3859,10 @@ static inline int ata_should_dma_map(struct ata_queued_cmd *qc) 
 *	spin_lock_irqsave(host_set lock)

 *

 *	RETURNS:

 *	Zero on success, negative on error.

 *	Zero on success, AC_ERR_* mask on failure

 */



int ata_qc_issue(struct ata_queued_cmd *qc)

unsigned int ata_qc_issue(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;
@@ -3888,7 +3887,7 @@ int ata_qc_issue(struct ata_queued_cmd *qc) 


sg_err:

	qc->flags &= ~ATA_QCFLAG_DMAMAP;

	return -1;

	return AC_ERR_SYSTEM;

}
@@ -3907,10 +3906,10 @@ int ata_qc_issue(struct ata_queued_cmd *qc) 
 *	spin_lock_irqsave(host_set lock)

 *

 *	RETURNS:

 *	Zero on success, negative on error.

 *	Zero on success, AC_ERR_* mask on failure

 */



int ata_qc_issue_prot(struct ata_queued_cmd *qc)

unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;
@@ -4015,7 +4014,7 @@ int ata_qc_issue_prot(struct ata_queued_cmd *qc) 


	default:

		WARN_ON(1);

		return -1;

		return AC_ERR_SYSTEM;

	}



	return 0;

drivers/scsi/libata-scsi.c

+4 −6
Original line number Diff line number Diff line
@@ -1322,10 +1322,9 @@ static void ata_scsi_translate(struct ata_port *ap, struct ata_device *dev, 
		goto early_finish;



	/* select device, send command to hardware */

	if (ata_qc_issue(qc)) {

		qc->err_mask |= AC_ERR_OTHER;

	qc->err_mask = ata_qc_issue(qc);

	if (qc->err_mask)

		ata_qc_complete(qc);

	}



	VPRINTK("EXIT\n");

	return;
@@ -2044,10 +2043,9 @@ static void atapi_request_sense(struct ata_queued_cmd *qc) 


	qc->complete_fn = atapi_sense_complete;



	if (ata_qc_issue(qc)) {

		qc->err_mask |= AC_ERR_OTHER;

	qc->err_mask = ata_qc_issue(qc);

	if (qc->err_mask)

		ata_qc_complete(qc);

	}



	DPRINTK("EXIT\n");

}

drivers/scsi/libata.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, 
				      struct ata_device *dev);

extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc);

extern void ata_qc_free(struct ata_queued_cmd *qc);

extern int ata_qc_issue(struct ata_queued_cmd *qc);

extern unsigned int ata_qc_issue(struct ata_queued_cmd *qc);

extern int ata_check_atapi_dma(struct ata_queued_cmd *qc);

extern void ata_dev_select(struct ata_port *ap, unsigned int device,

                           unsigned int wait, unsigned int can_sleep);

drivers/scsi/pdc_adma.c

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static void adma_host_stop(struct ata_host_set *host_set); 
static void adma_port_stop(struct ata_port *ap);

static void adma_phy_reset(struct ata_port *ap);

static void adma_qc_prep(struct ata_queued_cmd *qc);

static int adma_qc_issue(struct ata_queued_cmd *qc);

static unsigned int adma_qc_issue(struct ata_queued_cmd *qc);

static int adma_check_atapi_dma(struct ata_queued_cmd *qc);

static void adma_bmdma_stop(struct ata_queued_cmd *qc);

static u8 adma_bmdma_status(struct ata_port *ap);
@@ -419,7 +419,7 @@ static inline void adma_packet_start(struct ata_queued_cmd *qc) 
	writew(aPIOMD4 | aGO, chan + ADMA_CONTROL);

}



static int adma_qc_issue(struct ata_queued_cmd *qc)

static unsigned int adma_qc_issue(struct ata_queued_cmd *qc)

{

	struct adma_port_priv *pp = qc->ap->private_data;