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

Commit 198e0fed authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] libata: rename ATA_FLAG_PORT_DISABLED to ATA_FLAG_DISABLED 



Rename ATA_FLAG_PORT_DISABLED to ATA_FLAG_DISABLED for consistency.
(ATA_FLAG_* are always about ports).

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 949b38af

drivers/scsi/libata-core.c

+9 −9
Original line number Diff line number Diff line
@@ -1045,7 +1045,7 @@ ata_exec_internal(struct ata_port *ap, struct ata_device *dev, 
	 *

	 * Kill the following code as soon as those drivers are fixed.

	 */

	if (ap->flags & ATA_FLAG_PORT_DISABLED) {

	if (ap->flags & ATA_FLAG_DISABLED) {

		err_mask |= AC_ERR_SYSTEM;

		ata_port_probe(ap);

	}
@@ -1395,7 +1395,7 @@ static int ata_bus_probe(struct ata_port *ap) 
	} else {

		ap->ops->phy_reset(ap);



		if (!(ap->flags & ATA_FLAG_PORT_DISABLED))

		if (!(ap->flags & ATA_FLAG_DISABLED))

			for (i = 0; i < ATA_MAX_DEVICES; i++)

				classes[i] = ap->device[i].class;
@@ -1491,7 +1491,7 @@ static int ata_bus_probe(struct ata_port *ap) 


void ata_port_probe(struct ata_port *ap)

{

	ap->flags &= ~ATA_FLAG_PORT_DISABLED;

	ap->flags &= ~ATA_FLAG_DISABLED;

}



/**
@@ -1565,7 +1565,7 @@ void __sata_phy_reset(struct ata_port *ap) 
	else

		ata_port_disable(ap);



	if (ap->flags & ATA_FLAG_PORT_DISABLED)

	if (ap->flags & ATA_FLAG_DISABLED)

		return;



	if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
@@ -1590,7 +1590,7 @@ void __sata_phy_reset(struct ata_port *ap) 
void sata_phy_reset(struct ata_port *ap)

{

	__sata_phy_reset(ap);

	if (ap->flags & ATA_FLAG_PORT_DISABLED)

	if (ap->flags & ATA_FLAG_DISABLED)

		return;

	ata_bus_reset(ap);

}
@@ -1629,7 +1629,7 @@ void ata_port_disable(struct ata_port *ap) 
{

	ap->device[0].class = ATA_DEV_NONE;

	ap->device[1].class = ATA_DEV_NONE;

	ap->flags |= ATA_FLAG_PORT_DISABLED;

	ap->flags |= ATA_FLAG_DISABLED;

}



/**
@@ -2251,7 +2251,7 @@ static unsigned int ata_bus_softreset(struct ata_port *ap, 
 *	Obtains host_set lock.

 *

 *	SIDE EFFECTS:

 *	Sets ATA_FLAG_PORT_DISABLED if bus reset fails.

 *	Sets ATA_FLAG_DISABLED if bus reset fails.

 */



void ata_bus_reset(struct ata_port *ap)
@@ -4468,7 +4468,7 @@ irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs) 


		ap = host_set->ports[i];

		if (ap &&

		    !(ap->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))) {

		    !(ap->flags & (ATA_FLAG_DISABLED | ATA_FLAG_NOINTR))) {

			struct ata_queued_cmd *qc;



			qc = ata_qc_from_tag(ap, ap->active_tag);
@@ -4689,7 +4689,7 @@ static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host, 
	host->unique_id = ata_unique_id++;

	host->max_cmd_len = 12;



	ap->flags = ATA_FLAG_PORT_DISABLED;

	ap->flags = ATA_FLAG_DISABLED;

	ap->id = host->unique_id;

	ap->host = host;

	ap->ctl = ATA_DEVCTL_OBS;

drivers/scsi/libata-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -2728,7 +2728,7 @@ void ata_scsi_scan_host(struct ata_port *ap) 
	struct ata_device *dev;

	unsigned int i;



	if (ap->flags & ATA_FLAG_PORT_DISABLED)

	if (ap->flags & ATA_FLAG_DISABLED)

		return;



	for (i = 0; i < ATA_MAX_DEVICES; i++) {

drivers/scsi/pdc_adma.c

+2 −2
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static inline unsigned int adma_intr_pkt(struct ata_host_set *host_set) 
			continue;

		handled = 1;

		adma_enter_reg_mode(ap);

		if (ap->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))

		if (ap->flags & (ATA_FLAG_DISABLED | ATA_FLAG_NOINTR))

			continue;

		pp = ap->private_data;

		if (!pp || pp->state != adma_state_pkt)
@@ -481,7 +481,7 @@ static inline unsigned int adma_intr_mmio(struct ata_host_set *host_set) 
	for (port_no = 0; port_no < host_set->n_ports; ++port_no) {

		struct ata_port *ap;

		ap = host_set->ports[port_no];

		if (ap && (!(ap->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR)))) {

		if (ap && (!(ap->flags & (ATA_FLAG_DISABLED | ATA_FLAG_NOINTR)))) {

			struct ata_queued_cmd *qc;

			struct adma_port_priv *pp = ap->private_data;

			if (!pp || pp->state != adma_state_mmio)

drivers/scsi/sata_mv.c

+1 −1
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant, 
			}

		}



		if (ap->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))

		if (ap->flags & (ATA_FLAG_DISABLED | ATA_FLAG_NOINTR))

			continue;



		err_mask = ac_err_mask(ata_status);

drivers/scsi/sata_nv.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static irqreturn_t nv_interrupt (int irq, void *dev_instance, 


		ap = host_set->ports[i];

		if (ap &&

		    !(ap->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))) {

		    !(ap->flags & (ATA_FLAG_DISABLED | ATA_FLAG_NOINTR))) {

			struct ata_queued_cmd *qc;



			qc = ata_qc_from_tag(ap, ap->active_tag);