Commit 741e9d66 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI updates from James Bottomley:
 "Only a couple of driver updates this time (lpfc and mpt3sas) plus the
  usual assorted minor fixes and updates. The major core update is a set
  of patches moving retries out of the drivers and into the core"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (84 commits)
  scsi: core: Constify the struct device_type usage
  scsi: libfc: replace deprecated strncpy() with memcpy()
  scsi: lpfc: Replace deprecated strncpy() with strscpy()
  scsi: bfa: Fix function pointer type mismatch for state machines
  scsi: bfa: Fix function pointer type mismatch for hcb_qe->cbfn
  scsi: bfa: Remove additional unnecessary struct declarations
  scsi: csiostor: Avoid function pointer casts
  scsi: qla1280: Remove redundant assignment to variable 'mr'
  scsi: core: Make scsi_bus_type const
  scsi: core: Really include kunit tests with SCSI_LIB_KUNIT_TEST
  scsi: target: tcm_loop: Make tcm_loop_lld_bus const
  scsi: scsi_debug: Make pseudo_lld_bus const
  scsi: iscsi: Make iscsi_flashnode_bus const
  scsi: fcoe: Make fcoe_bus_type const
  scsi: lpfc: Copyright updates for 14.4.0.0 patches
  scsi: lpfc: Update lpfc version to 14.4.0.0
  scsi: lpfc: Change lpfc_vport load_flag member into a bitmask
  scsi: lpfc: Change lpfc_vport fc_flag member into a bitmask
  scsi: lpfc: Protect vport fc_nodes list with an explicit spin lock
  scsi: lpfc: Change nlp state statistic counters into atomic_t
  ...
parents 342d9653 517bcc2b

drivers/message/fusion/mptfc.c

+1 −3
Original line number Diff line number Diff line
@@ -1401,7 +1401,6 @@ static struct pci_driver mptfc_driver = { 
static int

mptfc_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)

{

	MPT_SCSI_HOST *hd;

	u8 event = le32_to_cpu(pEvReply->Event) & 0xFF;

	unsigned long flags;

	int rc=1;
@@ -1412,8 +1411,7 @@ mptfc_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply) 
	devtverboseprintk(ioc, printk(MYIOC_s_DEBUG_FMT "MPT event (=%02Xh) routed to SCSI host driver!\n",

			ioc->name, event));



	if (ioc->sh == NULL ||

		((hd = shost_priv(ioc->sh)) == NULL))

	if (ioc->sh == NULL || shost_priv(ioc->sh) == NULL)

		return 1;



	switch (event) {

drivers/scsi/3w-9xxx.c

+22 −22
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static ssize_t twa_show_stats(struct device *dev, 
	ssize_t len;



	spin_lock_irqsave(tw_dev->host->host_lock, flags);

	len = snprintf(buf, PAGE_SIZE, "3w-9xxx Driver version: %s\n"

	len = sysfs_emit(buf, "3w-9xxx Driver version: %s\n"

			 "Current commands posted:   %4d\n"

			 "Max commands posted:       %4d\n"

			 "Current pending commands:  %4d\n"

drivers/scsi/3w-sas.c

+18 −18
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static ssize_t twl_show_stats(struct device *dev, 
	ssize_t len;



	spin_lock_irqsave(tw_dev->host->host_lock, flags);

	len = snprintf(buf, PAGE_SIZE, "3w-sas Driver version: %s\n"

	len = sysfs_emit(buf, "3w-sas Driver version: %s\n"

			 "Current commands posted:   %4d\n"

			 "Max commands posted:       %4d\n"

			 "Last sgl length:           %4d\n"

drivers/scsi/3w-xxxx.c

+22 −22
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static ssize_t tw_show_stats(struct device *dev, struct device_attribute *attr, 
	ssize_t len;



	spin_lock_irqsave(tw_dev->host->host_lock, flags);

	len = snprintf(buf, PAGE_SIZE, "3w-xxxx Driver version: %s\n"

	len = sysfs_emit(buf, "3w-xxxx Driver version: %s\n"

			 "Current commands posted:   %4d\n"

			 "Max commands posted:       %4d\n"

			 "Current pending commands:  %4d\n"

drivers/scsi/53c700.c

+1 −1
Original line number Diff line number Diff line
@@ -2071,7 +2071,7 @@ NCR_700_show_active_tags(struct device *dev, struct device_attribute *attr, char 
{

	struct scsi_device *SDp = to_scsi_device(dev);



	return snprintf(buf, 20, "%d\n", NCR_700_get_depth(SDp));

	return sysfs_emit(buf, "%d\n", NCR_700_get_depth(SDp));

}



static struct device_attribute NCR_700_active_tags_attr = {