[PATCH] libata: ata_scsi_slave_config cleanup
Encapsulate some of ata_scsi_slave_config so that parts can be reused in future SAS patches. Signed-off-by: Brian King <brking@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
e46834cd2d
commit
a6cce2a79d
|
@ -662,33 +662,17 @@ void ata_gen_fixed_sense(struct ata_queued_cmd *qc)
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* ata_scsi_slave_config - Set SCSI device attributes
|
||||
* @sdev: SCSI device to examine
|
||||
*
|
||||
* This is called before we actually start reading
|
||||
* and writing to the device, to configure certain
|
||||
* SCSI mid-layer behaviors.
|
||||
*
|
||||
* LOCKING:
|
||||
* Defined by SCSI layer. We don't really care.
|
||||
*/
|
||||
|
||||
int ata_scsi_slave_config(struct scsi_device *sdev)
|
||||
static void ata_scsi_sdev_config(struct scsi_device *sdev)
|
||||
{
|
||||
sdev->use_10_for_rw = 1;
|
||||
sdev->use_10_for_ms = 1;
|
||||
}
|
||||
|
||||
blk_queue_max_phys_segments(sdev->request_queue, LIBATA_MAX_PRD);
|
||||
|
||||
if (sdev->id < ATA_MAX_DEVICES) {
|
||||
struct ata_port *ap;
|
||||
struct ata_device *dev;
|
||||
static void ata_scsi_dev_config(struct scsi_device *sdev,
|
||||
struct ata_device *dev)
|
||||
{
|
||||
unsigned int max_sectors;
|
||||
|
||||
ap = (struct ata_port *) &sdev->host->hostdata[0];
|
||||
dev = &ap->device[sdev->id];
|
||||
|
||||
/* TODO: 2048 is an arbitrary number, not the
|
||||
* hardware maximum. This should be increased to
|
||||
* 65534 when Jens Axboe's patch for dynamically
|
||||
|
@ -711,6 +695,34 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
|
|||
request_queue_t *q = sdev->request_queue;
|
||||
blk_queue_max_hw_segments(q, q->max_hw_segments - 1);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* ata_scsi_slave_config - Set SCSI device attributes
|
||||
* @sdev: SCSI device to examine
|
||||
*
|
||||
* This is called before we actually start reading
|
||||
* and writing to the device, to configure certain
|
||||
* SCSI mid-layer behaviors.
|
||||
*
|
||||
* LOCKING:
|
||||
* Defined by SCSI layer. We don't really care.
|
||||
*/
|
||||
|
||||
int ata_scsi_slave_config(struct scsi_device *sdev)
|
||||
{
|
||||
ata_scsi_sdev_config(sdev);
|
||||
|
||||
blk_queue_max_phys_segments(sdev->request_queue, LIBATA_MAX_PRD);
|
||||
|
||||
if (sdev->id < ATA_MAX_DEVICES) {
|
||||
struct ata_port *ap;
|
||||
struct ata_device *dev;
|
||||
|
||||
ap = (struct ata_port *) &sdev->host->hostdata[0];
|
||||
dev = &ap->device[sdev->id];
|
||||
|
||||
ata_scsi_dev_config(sdev, dev);
|
||||
}
|
||||
|
||||
return 0; /* scsi layer doesn't check return value, sigh */
|
||||
|
|
Loading…
Reference in New Issue