Skip to content

Commit

Permalink
[PATCH] libata: rename ATA_FLAG_PORT_DISABLED to ATA_FLAG_DISABLED
Browse files Browse the repository at this point in the history 
Rename ATA_FLAG_PORT_DISABLED to ATA_FLAG_DISABLED for consistency.
(ATA_FLAG_* are always about ports).

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Apr 2, 2006
1 parent 949b38a commit 198e0fe
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
18 changes: 9 additions & 9 deletions drivers/scsi/libata-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}

/**
Expand Down Expand Up @@ -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)) {
Expand All @@ -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);
}
Expand Down Expand Up @@ -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;
}

/**
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/libata-scsi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down
4 changes: 2 additions & 2 deletions drivers/scsi/pdc_adma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/sata_mv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/sata_nv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/sata_promise.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *r
ap = host_set->ports[i];
tmp = mask & (1 << (i + 1));
if (tmp && 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);
Expand Down
4 changes: 2 additions & 2 deletions drivers/scsi/sata_qstor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ static inline unsigned int qs_intr_pkt(struct ata_host_set *host_set)
sff1, sff0, port_no, sHST, sDST);
handled = 1;
if (ap && !(ap->flags &
(ATA_FLAG_PORT_DISABLED|ATA_FLAG_NOINTR))) {
(ATA_FLAG_DISABLED|ATA_FLAG_NOINTR))) {
struct ata_queued_cmd *qc;
struct qs_port_priv *pp = ap->private_data;
if (!pp || pp->state != qs_state_pkt)
Expand Down Expand Up @@ -429,7 +429,7 @@ static inline unsigned int qs_intr_mmio(struct ata_host_set *host_set)
struct ata_port *ap;
ap = host_set->ports[port_no];
if (ap &&
!(ap->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))) {
!(ap->flags & (ATA_FLAG_DISABLED | ATA_FLAG_NOINTR))) {
struct ata_queued_cmd *qc;
struct qs_port_priv *pp = ap->private_data;
if (!pp || pp->state != qs_state_mmio)
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/sata_sil24.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ static irqreturn_t sil24_interrupt(int irq, void *dev_instance, struct pt_regs *
for (i = 0; i < host_set->n_ports; i++)
if (status & (1 << i)) {
struct ata_port *ap = host_set->ports[i];
if (ap && !(ap->flags & ATA_FLAG_PORT_DISABLED)) {
if (ap && !(ap->flags & ATA_FLAG_DISABLED)) {
sil24_host_intr(host_set->ports[i]);
handled++;
} else
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/sata_sx4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ static irqreturn_t pdc20621_interrupt (int irq, void *dev_instance, struct pt_re
tmp = mask & (1 << i);
VPRINTK("seq %u, port_no %u, ap %p, tmp %x\n", i, port_no, ap, tmp);
if (tmp && 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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/sata_vsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance,
ap = host_set->ports[i];

if (ap && !(ap->flags &
(ATA_FLAG_PORT_DISABLED|ATA_FLAG_NOINTR))) {
(ATA_FLAG_DISABLED|ATA_FLAG_NOINTR))) {
struct ata_queued_cmd *qc;

qc = ata_qc_from_tag(ap, ap->active_tag);
Expand Down
2 changes: 1 addition & 1 deletion include/linux/libata.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ enum {
ATA_FLAG_DEBUGMSG = (1 << 17),
ATA_FLAG_FLUSH_PORT_TASK = (1 << 18), /* flush port task */

ATA_FLAG_PORT_DISABLED = (1 << 19), /* port is disabled, ignore it */
ATA_FLAG_DISABLED = (1 << 19), /* port is disabled, ignore it */
ATA_FLAG_SUSPENDED = (1 << 20), /* port is suspended */

/* bits 24:31 of ap->flags are reserved for LLDD specific flags */
Expand Down

0 comments on commit 198e0fe

Please sign in to comment.