Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI updates from James Bottomley: "This is mostly update of the usual drivers: smarpqi, lpfc, qedi, megaraid_sas, libsas, zfcp, mpt3sas, hisi_sas. Additionally, we have a pile of annotation, unused variable and minor updates. The big API change is the updates for Christoph's DMA rework which include removing the DISABLE_CLUSTERING flag. And finally there are a couple of target tree updates" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (259 commits) scsi: isci: request: mark expected switch fall-through scsi: isci: remote_node_context: mark expected switch fall-throughs scsi: isci: remote_device: Mark expected switch fall-throughs scsi: isci: phy: Mark expected switch fall-through scsi: iscsi: Capture iscsi debug messages using tracepoints scsi: myrb: Mark expected switch fall-throughs scsi: megaraid: fix out-of-bound array accesses scsi: mpt3sas: mpt3sas_scsih: Mark expected switch fall-through scsi: fcoe: remove set but not used variable 'port' scsi: smartpqi: call pqi_free_interrupts() in pqi_shutdown() scsi: smartpqi: fix build warnings scsi: smartpqi: update driver version scsi: smartpqi: add ofa support scsi: smartpqi: increase fw status register read timeout scsi: smartpqi: bump driver version scsi: smartpqi: add smp_utils support scsi: smartpqi: correct lun reset issues scsi: smartpqi: correct volume status scsi: smartpqi: do not offline disks for transient did no connect conditions scsi: smartpqi: allow for larger raid maps ...
This commit is contained in:
@@ -1256,11 +1256,6 @@ static int usbg_check_false(struct se_portal_group *se_tpg)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static char *usbg_get_fabric_name(void)
|
||||
{
|
||||
return "usb_gadget";
|
||||
}
|
||||
|
||||
static char *usbg_get_fabric_wwn(struct se_portal_group *se_tpg)
|
||||
{
|
||||
struct usbg_tpg *tpg = container_of(se_tpg,
|
||||
@@ -1718,8 +1713,7 @@ static int usbg_check_stop_free(struct se_cmd *se_cmd)
|
||||
|
||||
static const struct target_core_fabric_ops usbg_ops = {
|
||||
.module = THIS_MODULE,
|
||||
.name = "usb_gadget",
|
||||
.get_fabric_name = usbg_get_fabric_name,
|
||||
.fabric_name = "usb_gadget",
|
||||
.tpg_get_wwn = usbg_get_fabric_wwn,
|
||||
.tpg_get_tag = usbg_get_tag,
|
||||
.tpg_check_demo_mode = usbg_check_true,
|
||||
|
@@ -632,7 +632,6 @@ static struct scsi_host_template mts_scsi_host_template = {
|
||||
.sg_tablesize = SG_ALL,
|
||||
.can_queue = 1,
|
||||
.this_id = -1,
|
||||
.use_clustering = 1,
|
||||
.emulated = 1,
|
||||
.slave_alloc = mts_slave_alloc,
|
||||
.slave_configure = mts_slave_configure,
|
||||
|
@@ -639,13 +639,6 @@ static const struct scsi_host_template usb_stor_host_template = {
|
||||
*/
|
||||
.max_sectors = 240,
|
||||
|
||||
/*
|
||||
* merge commands... this seems to help performance, but
|
||||
* periodically someone should test to see which setting is more
|
||||
* optimal.
|
||||
*/
|
||||
.use_clustering = 1,
|
||||
|
||||
/* emulated HBA */
|
||||
.emulated = 1,
|
||||
|
||||
|
@@ -879,6 +879,7 @@ static struct scsi_host_template uas_host_template = {
|
||||
.this_id = -1,
|
||||
.sg_tablesize = SG_NONE,
|
||||
.skip_settle_delay = 1,
|
||||
.dma_boundary = PAGE_SIZE - 1,
|
||||
};
|
||||
|
||||
#define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \
|
||||
|
Verwijs in nieuw issue
Block a user