Commit 4b2f3ede authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] libata: fold ata_dev_config() into ata_dev_configure() 



ata_dev_config() needs to be done everytime a device is configured.
Fold it into ata_dev_configure().

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

drivers/scsi/libata-core.c

+17 −31
Original line number Diff line number Diff line
@@ -1053,6 +1053,12 @@ static int ata_dev_read_id(struct ata_port *ap, struct ata_device *dev, 
	return rc;

}



static inline u8 ata_dev_knobble(const struct ata_port *ap,

				 struct ata_device *dev)

{

	return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(dev->id)));

}



/**

 *	ata_dev_configure - Configure the specified ATA/ATAPI device

 *	@ap: Port on which target device resides
@@ -1167,6 +1173,17 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev) 
					      ap->host->max_cmd_len,

					      ap->device[i].cdb_len);



	/* limit bridge transfers to udma5, 200 sectors */

	if (ata_dev_knobble(ap, dev)) {

		printk(KERN_INFO "ata%u(%u): applying bridge limits\n",

		       ap->id, dev->devno);

		ap->udma_mask &= ATA_UDMA5;

		dev->max_sectors = ATA_MAX_SECTORS;

	}



	if (ap->ops->dev_config)

		ap->ops->dev_config(ap, dev);



	DPRINTK("EXIT, drv_stat = 0x%x\n", ata_chk_status(ap));

	return 0;
@@ -1177,35 +1194,6 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev) 
	return rc;

}





static inline u8 ata_dev_knobble(const struct ata_port *ap,

				 struct ata_device *dev)

{

	return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(dev->id)));

}



/**

 * ata_dev_config - Run device specific handlers & check for SATA->PATA bridges

 * @ap: Bus

 * @i:  Device

 *

 * LOCKING:

 */



void ata_dev_config(struct ata_port *ap, unsigned int i)

{

	/* limit bridge transfers to udma5, 200 sectors */

	if (ata_dev_knobble(ap, &ap->device[i])) {

		printk(KERN_INFO "ata%u(%u): applying bridge limits\n",

		       ap->id, i);

		ap->udma_mask &= ATA_UDMA5;

		ap->device[i].max_sectors = ATA_MAX_SECTORS;

	}



	if (ap->ops->dev_config)

		ap->ops->dev_config(ap, &ap->device[i]);

}



/**

 *	ata_bus_probe - Reset and probe ATA bus

 *	@ap: Bus to probe
@@ -1266,7 +1254,6 @@ static int ata_bus_probe(struct ata_port *ap) 
			continue;

		}



		ata_dev_config(ap, i);

		found = 1;

	}
@@ -4967,7 +4954,6 @@ EXPORT_SYMBOL_GPL(ata_host_intr); 
EXPORT_SYMBOL_GPL(ata_dev_classify);

EXPORT_SYMBOL_GPL(ata_id_string);

EXPORT_SYMBOL_GPL(ata_id_c_string);

EXPORT_SYMBOL_GPL(ata_dev_config);

EXPORT_SYMBOL_GPL(ata_scsi_simulate);

EXPORT_SYMBOL_GPL(ata_eh_qc_complete);

EXPORT_SYMBOL_GPL(ata_eh_qc_retry);

include/linux/libata.h

+0 −1
Original line number Diff line number Diff line
@@ -542,7 +542,6 @@ extern void ata_id_string(const u16 *id, unsigned char *s, 
			  unsigned int ofs, unsigned int len);

extern void ata_id_c_string(const u16 *id, unsigned char *s,

			    unsigned int ofs, unsigned int len);

extern void ata_dev_config(struct ata_port *ap, unsigned int i);

extern void ata_bmdma_setup (struct ata_queued_cmd *qc);

extern void ata_bmdma_start (struct ata_queued_cmd *qc);

extern void ata_bmdma_stop(struct ata_queued_cmd *qc);