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

Commit c9a512f8 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

ata: make qc_prep return ata_completion_errors 



commit 95364f36701e62dd50eee91e1303187fd1a9f567 upstream.

In case a driver wants to return an error from qc_prep, return enum
ata_completion_errors. sata_mv is one of those drivers -- see the next
patch. Other drivers return the newly defined AC_ERR_OK.

[v2] use enum ata_completion_errors and AC_ERR_OK.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-ide@vger.kernel.org
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a34e3ce8

Documentation/driver-api/libata.rst

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ High-level taskfile hooks 


::



    void (*qc_prep) (struct ata_queued_cmd *qc);

    enum ata_completion_errors (*qc_prep) (struct ata_queued_cmd *qc);

    int (*qc_issue) (struct ata_queued_cmd *qc);

drivers/ata/acard-ahci.c

+4 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct acard_sg { 
	__le32			size;	 /* bit 31 (EOT) max==0x10000 (64k) */

};



static void acard_ahci_qc_prep(struct ata_queued_cmd *qc);

static enum ata_completion_errors acard_ahci_qc_prep(struct ata_queued_cmd *qc);

static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc);

static int acard_ahci_port_start(struct ata_port *ap);

static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
@@ -257,7 +257,7 @@ static unsigned int acard_ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl) 
	return si;

}



static void acard_ahci_qc_prep(struct ata_queued_cmd *qc)

static enum ata_completion_errors acard_ahci_qc_prep(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;

	struct ahci_port_priv *pp = ap->private_data;
@@ -295,6 +295,8 @@ static void acard_ahci_qc_prep(struct ata_queued_cmd *qc) 
		opts |= AHCI_CMD_ATAPI | AHCI_CMD_PREFETCH;



	ahci_fill_cmd_slot(pp, qc->hw_tag, opts);



	return AC_ERR_OK;

}



static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc)

drivers/ata/libahci.c

+4 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val); 
static bool ahci_qc_fill_rtf(struct ata_queued_cmd *qc);

static int ahci_port_start(struct ata_port *ap);

static void ahci_port_stop(struct ata_port *ap);

static void ahci_qc_prep(struct ata_queued_cmd *qc);

static enum ata_completion_errors ahci_qc_prep(struct ata_queued_cmd *qc);

static int ahci_pmp_qc_defer(struct ata_queued_cmd *qc);

static void ahci_freeze(struct ata_port *ap);

static void ahci_thaw(struct ata_port *ap);
@@ -1640,7 +1640,7 @@ static int ahci_pmp_qc_defer(struct ata_queued_cmd *qc) 
		return sata_pmp_qc_defer_cmd_switch(qc);

}



static void ahci_qc_prep(struct ata_queued_cmd *qc)

static enum ata_completion_errors ahci_qc_prep(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;

	struct ahci_port_priv *pp = ap->private_data;
@@ -1676,6 +1676,8 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc) 
		opts |= AHCI_CMD_ATAPI | AHCI_CMD_PREFETCH;



	ahci_fill_cmd_slot(pp, qc->hw_tag, opts);



	return AC_ERR_OK;

}



static void ahci_fbs_dec_intr(struct ata_port *ap)

drivers/ata/libata-core.c

+7 −2
Original line number Diff line number Diff line
@@ -4996,7 +4996,10 @@ int ata_std_qc_defer(struct ata_queued_cmd *qc) 
	return ATA_DEFER_LINK;

}



void ata_noop_qc_prep(struct ata_queued_cmd *qc) { }

enum ata_completion_errors ata_noop_qc_prep(struct ata_queued_cmd *qc)

{

	return AC_ERR_OK;

}



/**

 *	ata_sg_init - Associate command with scatter-gather table.
@@ -5483,7 +5486,9 @@ void ata_qc_issue(struct ata_queued_cmd *qc) 
		return;

	}



	ap->ops->qc_prep(qc);

	qc->err_mask |= ap->ops->qc_prep(qc);

	if (unlikely(qc->err_mask))

		goto err;

	trace_ata_qc_issue(qc);

	qc->err_mask |= ap->ops->qc_issue(qc);

	if (unlikely(qc->err_mask))

drivers/ata/libata-sff.c

+8 −4
Original line number Diff line number Diff line
@@ -2695,12 +2695,14 @@ static void ata_bmdma_fill_sg_dumb(struct ata_queued_cmd *qc) 
 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 */

void ata_bmdma_qc_prep(struct ata_queued_cmd *qc)

enum ata_completion_errors ata_bmdma_qc_prep(struct ata_queued_cmd *qc)

{

	if (!(qc->flags & ATA_QCFLAG_DMAMAP))

		return;

		return AC_ERR_OK;



	ata_bmdma_fill_sg(qc);



	return AC_ERR_OK;

}

EXPORT_SYMBOL_GPL(ata_bmdma_qc_prep);
@@ -2713,12 +2715,14 @@ EXPORT_SYMBOL_GPL(ata_bmdma_qc_prep); 
 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 */

void ata_bmdma_dumb_qc_prep(struct ata_queued_cmd *qc)

enum ata_completion_errors ata_bmdma_dumb_qc_prep(struct ata_queued_cmd *qc)

{

	if (!(qc->flags & ATA_QCFLAG_DMAMAP))

		return;

		return AC_ERR_OK;



	ata_bmdma_fill_sg_dumb(qc);



	return AC_ERR_OK;

}

EXPORT_SYMBOL_GPL(ata_bmdma_dumb_qc_prep);