Commit 68d1d07b authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: implement and use SHT initializers 



libata lets low level drivers build scsi_host_template and register it
to the SCSI layer.  This allows low level drivers high level of
flexibility but also burdens them with lots of boilerplate entries.

This patch implements SHT initializers which can be used to initialize
all the boilerplate entries in a sht.  Three variants of them are
implemented - BASE, BMDMA and NCQ - for different types of drivers.
Note that entries can be overriden by putting individual initializers
after the helper macro.

All sht tables are identical before and after this patch.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
parent 6bd99b4e

drivers/ata/ahci.c

+1 −14
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ enum { 
	AHCI_MAX_PORTS		= 32,

	AHCI_MAX_SG		= 168, /* hardware max is 64K */

	AHCI_DMA_BOUNDARY	= 0xffffffff,

	AHCI_USE_CLUSTERING	= 1,

	AHCI_MAX_CMDS		= 32,

	AHCI_CMD_SZ		= 32,

	AHCI_CMD_SLOT_SZ	= AHCI_MAX_CMDS * AHCI_CMD_SZ,
@@ -274,22 +273,10 @@ static struct class_device_attribute *ahci_shost_attrs[] = { 
};



static struct scsi_host_template ahci_sht = {

	.module			= THIS_MODULE,

	.name			= DRV_NAME,

	.ioctl			= ata_scsi_ioctl,

	.queuecommand		= ata_scsi_queuecmd,

	.change_queue_depth	= ata_scsi_change_queue_depth,

	ATA_NCQ_SHT(DRV_NAME),

	.can_queue		= AHCI_MAX_CMDS - 1,

	.this_id		= ATA_SHT_THIS_ID,

	.sg_tablesize		= AHCI_MAX_SG,

	.cmd_per_lun		= ATA_SHT_CMD_PER_LUN,

	.emulated		= ATA_SHT_EMULATED,

	.use_clustering		= AHCI_USE_CLUSTERING,

	.proc_name		= DRV_NAME,

	.dma_boundary		= AHCI_DMA_BOUNDARY,

	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

	.shost_attrs		= ahci_shost_attrs,

};

drivers/ata/ata_generic.c

+1 −15
Original line number Diff line number Diff line
@@ -95,21 +95,7 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused) 
}



static struct scsi_host_template generic_sht = {

	.module			= THIS_MODULE,

	.name			= DRV_NAME,

	.ioctl			= ata_scsi_ioctl,

	.queuecommand		= ata_scsi_queuecmd,

	.can_queue		= ATA_DEF_QUEUE,

	.this_id		= ATA_SHT_THIS_ID,

	.sg_tablesize		= LIBATA_MAX_PRD,

	.cmd_per_lun		= ATA_SHT_CMD_PER_LUN,

	.emulated		= ATA_SHT_EMULATED,

	.use_clustering		= ATA_SHT_USE_CLUSTERING,

	.proc_name		= DRV_NAME,

	.dma_boundary		= ATA_DMA_BOUNDARY,

	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

	ATA_BMDMA_SHT(DRV_NAME),

};



static struct ata_port_operations generic_port_ops = {

drivers/ata/ata_piix.c

+1 −15
Original line number Diff line number Diff line
@@ -291,21 +291,7 @@ static struct pci_driver piix_pci_driver = { 
};



static struct scsi_host_template piix_sht = {

	.module			= THIS_MODULE,

	.name			= DRV_NAME,

	.ioctl			= ata_scsi_ioctl,

	.queuecommand		= ata_scsi_queuecmd,

	.can_queue		= ATA_DEF_QUEUE,

	.this_id		= ATA_SHT_THIS_ID,

	.sg_tablesize		= LIBATA_MAX_PRD,

	.cmd_per_lun		= ATA_SHT_CMD_PER_LUN,

	.emulated		= ATA_SHT_EMULATED,

	.use_clustering		= ATA_SHT_USE_CLUSTERING,

	.proc_name		= DRV_NAME,

	.dma_boundary		= ATA_DMA_BOUNDARY,

	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

	ATA_BMDMA_SHT(DRV_NAME),

};



static const struct ata_port_operations piix_pata_ops = {

drivers/ata/pata_acpi.c

+1 −16
Original line number Diff line number Diff line
@@ -232,22 +232,7 @@ static int pacpi_port_start(struct ata_port *ap) 
}



static struct scsi_host_template pacpi_sht = {

	.module			= THIS_MODULE,

	.name			= DRV_NAME,

	.ioctl			= ata_scsi_ioctl,

	.queuecommand		= ata_scsi_queuecmd,

	.can_queue		= ATA_DEF_QUEUE,

	.this_id		= ATA_SHT_THIS_ID,

	.sg_tablesize		= LIBATA_MAX_PRD,

	.cmd_per_lun		= ATA_SHT_CMD_PER_LUN,

	.emulated		= ATA_SHT_EMULATED,

	.use_clustering		= ATA_SHT_USE_CLUSTERING,

	.proc_name		= DRV_NAME,

	.dma_boundary		= ATA_DMA_BOUNDARY,

	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	/* Use standard CHS mapping rules */

	.bios_param		= ata_std_bios_param,

	ATA_BMDMA_SHT(DRV_NAME),

};



static const struct ata_port_operations pacpi_ops = {

drivers/ata/pata_ali.c

+1 −15
Original line number Diff line number Diff line
@@ -339,21 +339,7 @@ static int ali_check_atapi_dma(struct ata_queued_cmd *qc) 
}



static struct scsi_host_template ali_sht = {

	.module			= THIS_MODULE,

	.name			= DRV_NAME,

	.ioctl			= ata_scsi_ioctl,

	.queuecommand		= ata_scsi_queuecmd,

	.can_queue		= ATA_DEF_QUEUE,

	.this_id		= ATA_SHT_THIS_ID,

	.sg_tablesize		= LIBATA_MAX_PRD,

	.cmd_per_lun		= ATA_SHT_CMD_PER_LUN,

	.emulated		= ATA_SHT_EMULATED,

	.use_clustering		= ATA_SHT_USE_CLUSTERING,

	.proc_name		= DRV_NAME,

	.dma_boundary		= ATA_DMA_BOUNDARY,

	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

	ATA_BMDMA_SHT(DRV_NAME),

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE