scsi: aacraid: Fix camel case (1c68856e) · Commits · e / devices / android_kernel_teracube_mt6765

drivers/scsi/aacraid/aachba.c

+29 −24

Original line number	Original line	Diff line number	Diff line
	@@ -483,7 +483,7 @@ int aac_get_containers(struct aac_dev *dev)
	if (status >= 0) {		if (status >= 0) {
	dresp = (struct aac_get_container_count_resp *)fib_data(fibptr);		dresp = (struct aac_get_container_count_resp *)fib_data(fibptr);
	maximum_num_containers = le32_to_cpu(dresp->ContainerSwitchEntries);		maximum_num_containers = le32_to_cpu(dresp->ContainerSwitchEntries);
	if (fibptr->dev->supplement_adapter_info.SupportedOptions2 &		if (fibptr->dev->supplement_adapter_info.supported_options2 &
	AAC_OPTION_SUPPORTED_240_VOLUMES) {		AAC_OPTION_SUPPORTED_240_VOLUMES) {
	maximum_num_containers =		maximum_num_containers =
	le32_to_cpu(dresp->MaxSimpleVolumes);		le32_to_cpu(dresp->MaxSimpleVolumes);
	@@ -639,13 +639,16 @@ static void _aac_probe_container2(void * context, struct fib * fibptr)
	fsa_dev_ptr = fibptr->dev->fsa_dev;		fsa_dev_ptr = fibptr->dev->fsa_dev;
	if (fsa_dev_ptr) {		if (fsa_dev_ptr) {
	struct aac_mount * dresp = (struct aac_mount *) fib_data(fibptr);		struct aac_mount * dresp = (struct aac_mount *) fib_data(fibptr);
			__le32 sup_options2;

	fsa_dev_ptr += scmd_id(scsicmd);		fsa_dev_ptr += scmd_id(scsicmd);
			sup_options2 =
			fibptr->dev->supplement_adapter_info.supported_options2;

	if ((le32_to_cpu(dresp->status) == ST_OK) &&		if ((le32_to_cpu(dresp->status) == ST_OK) &&
	(le32_to_cpu(dresp->mnt[0].vol) != CT_NONE) &&		(le32_to_cpu(dresp->mnt[0].vol) != CT_NONE) &&
	(le32_to_cpu(dresp->mnt[0].state) != FSCS_HIDDEN)) {		(le32_to_cpu(dresp->mnt[0].state) != FSCS_HIDDEN)) {
	if (!(fibptr->dev->supplement_adapter_info.SupportedOptions2 &		if (!(sup_options2 & AAC_OPTION_VARIABLE_BLOCK_SIZE)) {
	AAC_OPTION_VARIABLE_BLOCK_SIZE)) {
	dresp->mnt[0].fileinfo.bdevinfo.block_size = 0x200;		dresp->mnt[0].fileinfo.bdevinfo.block_size = 0x200;
	fsa_dev_ptr->block_size = 0x200;		fsa_dev_ptr->block_size = 0x200;
	} else {		} else {
	@@ -688,7 +691,7 @@ static void _aac_probe_container1(void * context, struct fib * fibptr)
	int status;		int status;

	dresp = (struct aac_mount *) fib_data(fibptr);		dresp = (struct aac_mount *) fib_data(fibptr);
	if (!(fibptr->dev->supplement_adapter_info.SupportedOptions2 &		if (!(fibptr->dev->supplement_adapter_info.supported_options2 &
	AAC_OPTION_VARIABLE_BLOCK_SIZE))		AAC_OPTION_VARIABLE_BLOCK_SIZE))
	dresp->mnt[0].capacityhigh = 0;		dresp->mnt[0].capacityhigh = 0;
	if ((le32_to_cpu(dresp->status) != ST_OK) \|\|		if ((le32_to_cpu(dresp->status) != ST_OK) \|\|
	@@ -705,7 +708,7 @@ static void _aac_probe_container1(void * context, struct fib * fibptr)

	dinfo = (struct aac_query_mount *)fib_data(fibptr);		dinfo = (struct aac_query_mount *)fib_data(fibptr);

	if (fibptr->dev->supplement_adapter_info.SupportedOptions2 &		if (fibptr->dev->supplement_adapter_info.supported_options2 &
	AAC_OPTION_VARIABLE_BLOCK_SIZE)		AAC_OPTION_VARIABLE_BLOCK_SIZE)
	dinfo->command = cpu_to_le32(VM_NameServeAllBlk);		dinfo->command = cpu_to_le32(VM_NameServeAllBlk);
	else		else
	@@ -745,7 +748,7 @@ static int _aac_probe_container(struct scsi_cmnd * scsicmd, int (*callback)(stru

	dinfo = (struct aac_query_mount *)fib_data(fibptr);		dinfo = (struct aac_query_mount *)fib_data(fibptr);

	if (fibptr->dev->supplement_adapter_info.SupportedOptions2 &		if (fibptr->dev->supplement_adapter_info.supported_options2 &
	AAC_OPTION_VARIABLE_BLOCK_SIZE)		AAC_OPTION_VARIABLE_BLOCK_SIZE)
	dinfo->command = cpu_to_le32(VM_NameServeAllBlk);		dinfo->command = cpu_to_le32(VM_NameServeAllBlk);
	else		else
	@@ -896,12 +899,14 @@ char * get_container_type(unsigned tindex)
	static void setinqstr(struct aac_dev dev, void data, int tindex)		static void setinqstr(struct aac_dev dev, void data, int tindex)
	{		{
	struct scsi_inq *str;		struct scsi_inq *str;
			struct aac_supplement_adapter_info *sup_adap_info;

			sup_adap_info = &dev->supplement_adapter_info;
	str = (struct scsi_inq )(data); / cast data to scsi inq block */		str = (struct scsi_inq )(data); / cast data to scsi inq block */
	memset(str, ' ', sizeof(*str));		memset(str, ' ', sizeof(*str));

	if (dev->supplement_adapter_info.AdapterTypeText[0]) {		if (sup_adap_info->adapter_type_text[0]) {
	char * cp = dev->supplement_adapter_info.AdapterTypeText;		char *cp = sup_adap_info->adapter_type_text;
	int c;		int c;
	if ((cp[0] == 'A') && (cp[1] == 'O') && (cp[2] == 'C'))		if ((cp[0] == 'A') && (cp[1] == 'O') && (cp[2] == 'C'))
	inqstrcpy("SMC", str->vid);		inqstrcpy("SMC", str->vid);
	@@ -911,8 +916,7 @@ static void setinqstr(struct aac_dev dev, void data, int tindex)
	++cp;		++cp;
	c = *cp;		c = *cp;
	*cp = '\0';		*cp = '\0';
	inqstrcpy (dev->supplement_adapter_info.AdapterTypeText,		inqstrcpy(sup_adap_info->adapter_type_text, str->vid);
	str->vid);
	*cp = c;		*cp = c;
	while (cp && cp != ' ')		while (cp && cp != ' ')
	++cp;		++cp;
	@@ -1675,8 +1679,8 @@ int aac_issue_bmic_identify(struct aac_dev *dev, u32 bus, u32 target)
	if (!identify_resp)		if (!identify_resp)
	goto fib_free_ptr;		goto fib_free_ptr;

	vbus = (u32)le16_to_cpu(dev->supplement_adapter_info.VirtDeviceBus);		vbus = (u32)le16_to_cpu(dev->supplement_adapter_info.virt_device_bus);
	vid = (u32)le16_to_cpu(dev->supplement_adapter_info.VirtDeviceTarget);		vid = (u32)le16_to_cpu(dev->supplement_adapter_info.virt_device_target);

	aac_fib_init(fibptr);		aac_fib_init(fibptr);

	@@ -1815,9 +1819,9 @@ int aac_report_phys_luns(struct aac_dev dev, struct fib fibptr, int rescan)
	}		}

	vbus = (u32) le16_to_cpu(		vbus = (u32) le16_to_cpu(
	dev->supplement_adapter_info.VirtDeviceBus);		dev->supplement_adapter_info.virt_device_bus);
	vid = (u32) le16_to_cpu(		vid = (u32) le16_to_cpu(
	dev->supplement_adapter_info.VirtDeviceTarget);		dev->supplement_adapter_info.virt_device_target);

	aac_fib_init(fibptr);		aac_fib_init(fibptr);

	@@ -1893,7 +1897,7 @@ int aac_get_adapter_info(struct aac_dev* dev)
	}		}
	memcpy(&dev->adapter_info, info, sizeof(*info));		memcpy(&dev->adapter_info, info, sizeof(*info));

	dev->supplement_adapter_info.VirtDeviceBus = 0xffff;		dev->supplement_adapter_info.virt_device_bus = 0xffff;
	if (dev->adapter_info.options & AAC_OPT_SUPPLEMENT_ADAPTER_INFO) {		if (dev->adapter_info.options & AAC_OPT_SUPPLEMENT_ADAPTER_INFO) {
	struct aac_supplement_adapter_info * sinfo;		struct aac_supplement_adapter_info * sinfo;

	@@ -1961,7 +1965,7 @@ int aac_get_adapter_info(struct aac_dev* dev)
	}		}

	if (!dev->sync_mode && dev->sa_firmware &&		if (!dev->sync_mode && dev->sa_firmware &&
	dev->supplement_adapter_info.VirtDeviceBus != 0xffff) {		dev->supplement_adapter_info.virt_device_bus != 0xffff) {
	/* Thor SA Firmware -> CISS_REPORT_PHYSICAL_LUNS */		/* Thor SA Firmware -> CISS_REPORT_PHYSICAL_LUNS */
	rcode = aac_report_phys_luns(dev, fibptr, AAC_INIT);		rcode = aac_report_phys_luns(dev, fibptr, AAC_INIT);
	}		}
	@@ -1976,8 +1980,8 @@ int aac_get_adapter_info(struct aac_dev* dev)
	(tmp>>16)&0xff,		(tmp>>16)&0xff,
	tmp&0xff,		tmp&0xff,
	le32_to_cpu(dev->adapter_info.kernelbuild),		le32_to_cpu(dev->adapter_info.kernelbuild),
	(int)sizeof(dev->supplement_adapter_info.BuildDate),		(int)sizeof(dev->supplement_adapter_info.build_date),
	dev->supplement_adapter_info.BuildDate);		dev->supplement_adapter_info.build_date);
	tmp = le32_to_cpu(dev->adapter_info.monitorrev);		tmp = le32_to_cpu(dev->adapter_info.monitorrev);
	printk(KERN_INFO "%s%d: monitor %d.%d-%d[%d]\n",		printk(KERN_INFO "%s%d: monitor %d.%d-%d[%d]\n",
	dev->name, dev->id,		dev->name, dev->id,
	@@ -1993,14 +1997,15 @@ int aac_get_adapter_info(struct aac_dev* dev)
	shost_to_class(dev->scsi_host_ptr), buffer))		shost_to_class(dev->scsi_host_ptr), buffer))
	printk(KERN_INFO "%s%d: serial %s",		printk(KERN_INFO "%s%d: serial %s",
	dev->name, dev->id, buffer);		dev->name, dev->id, buffer);
	if (dev->supplement_adapter_info.VpdInfo.Tsid[0]) {		if (dev->supplement_adapter_info.vpd_info.tsid[0]) {
	printk(KERN_INFO "%s%d: TSID %.*s\n",		printk(KERN_INFO "%s%d: TSID %.*s\n",
	dev->name, dev->id,		dev->name, dev->id,
	(int)sizeof(dev->supplement_adapter_info.VpdInfo.Tsid),		(int)sizeof(dev->supplement_adapter_info
	dev->supplement_adapter_info.VpdInfo.Tsid);		.vpd_info.tsid),
			dev->supplement_adapter_info.vpd_info.tsid);
	}		}
	if (!aac_check_reset \|\| ((aac_check_reset == 1) &&		if (!aac_check_reset \|\| ((aac_check_reset == 1) &&
	(dev->supplement_adapter_info.SupportedOptions2 &		(dev->supplement_adapter_info.supported_options2 &
	AAC_OPTION_IGNORE_RESET))) {		AAC_OPTION_IGNORE_RESET))) {
	printk(KERN_INFO "%s%d: Reset Adapter Ignored\n",		printk(KERN_INFO "%s%d: Reset Adapter Ignored\n",
	dev->name, dev->id);		dev->name, dev->id);
	@@ -2008,7 +2013,7 @@ int aac_get_adapter_info(struct aac_dev* dev)
	}		}

	dev->cache_protected = 0;		dev->cache_protected = 0;
	dev->jbod = ((dev->supplement_adapter_info.FeatureBits &		dev->jbod = ((dev->supplement_adapter_info.feature_bits &
	AAC_FEATURE_JBOD) != 0);		AAC_FEATURE_JBOD) != 0);
	dev->nondasd_support = 0;		dev->nondasd_support = 0;
	dev->raid_scsi_mode = 0;		dev->raid_scsi_mode = 0;
	@@ -2631,7 +2636,7 @@ static int aac_start_stop(struct scsi_cmnd *scsicmd)
	struct scsi_device *sdev = scsicmd->device;		struct scsi_device *sdev = scsicmd->device;
	struct aac_dev aac = (struct aac_dev )sdev->host->hostdata;		struct aac_dev aac = (struct aac_dev )sdev->host->hostdata;

	if (!(aac->supplement_adapter_info.SupportedOptions2 &		if (!(aac->supplement_adapter_info.supported_options2 &
	AAC_OPTION_POWER_MANAGEMENT)) {		AAC_OPTION_POWER_MANAGEMENT)) {
	scsicmd->result = DID_OK << 16 \| COMMAND_COMPLETE << 8 \|		scsicmd->result = DID_OK << 16 \| COMMAND_COMPLETE << 8 \|
	SAM_STAT_GOOD;		SAM_STAT_GOOD;

drivers/scsi/aacraid/aacraid.h

+49 −49

Original line number	Original line	Diff line number	Diff line
	@@ -1380,57 +1380,57 @@ struct aac_adapter_info

	struct aac_supplement_adapter_info		struct aac_supplement_adapter_info
	{		{
	u8 AdapterTypeText[17+1];		u8 adapter_type_text[17+1];
	u8 Pad[2];		u8 pad[2];
	__le32 FlashMemoryByteSize;		__le32 flash_memory_byte_size;
	__le32 FlashImageId;		__le32 flash_image_id;
	__le32 MaxNumberPorts;		__le32 max_number_ports;
	__le32 Version;		__le32 version;
	__le32 FeatureBits;		__le32 feature_bits;
	u8 SlotNumber;		u8 slot_number;
	u8 ReservedPad0[3];		u8 reserved_pad0[3];
	u8 BuildDate[12];		u8 build_date[12];
	__le32 CurrentNumberPorts;		__le32 current_number_ports;
	struct {		struct {
	u8 AssemblyPn[8];		u8 assembly_pn[8];
	u8 FruPn[8];		u8 fru_pn[8];
	u8 BatteryFruPn[8];		u8 battery_fru_pn[8];
	u8 EcVersionString[8];		u8 ec_version_string[8];
	u8 Tsid[12];		u8 tsid[12];
	} VpdInfo;		} vpd_info;
	__le32 FlashFirmwareRevision;		__le32 flash_firmware_revision;
	__le32 FlashFirmwareBuild;		__le32 flash_firmware_build;
	__le32 RaidTypeMorphOptions;		__le32 raid_type_morph_options;
	__le32 FlashFirmwareBootRevision;		__le32 flash_firmware_boot_revision;
	__le32 FlashFirmwareBootBuild;		__le32 flash_firmware_boot_build;
	u8 MfgPcbaSerialNo[12];		u8 mfg_pcba_serial_no[12];
	u8 MfgWWNName[8];		u8 mfg_wwn_name[8];
	__le32 SupportedOptions2;		__le32 supported_options2;
	__le32 StructExpansion;		__le32 struct_expansion;
	/* StructExpansion == 1 */		/* StructExpansion == 1 */
	__le32 FeatureBits3;		__le32 feature_bits3;
	__le32 SupportedPerformanceModes;		__le32 supported_performance_modes;
	u8 HostBusType; /* uses HOST_BUS_TYPE_xxx defines */		u8 host_bus_type; /* uses HOST_BUS_TYPE_xxx defines */
	u8 HostBusWidth; /* actual width in bits or links */		u8 host_bus_width; /* actual width in bits or links */
	u16 HostBusSpeed; /* actual bus speed/link rate in MHz */		u16 host_bus_speed; /* actual bus speed/link rate in MHz */
	u8 MaxRRCDrives; /* max. number of ITP-RRC drives/pool */		u8 max_rrc_drives; /* max. number of ITP-RRC drives/pool */
	u8 MaxDiskXtasks; /* max. possible num of DiskX Tasks */		u8 max_disk_xtasks; /* max. possible num of DiskX Tasks */

	u8 CpldVerLoaded;		u8 cpld_ver_loaded;
	u8 CpldVerInFlash;		u8 cpld_ver_in_flash;

	__le64 MaxRRCCapacity;		__le64 max_rrc_capacity;
	__le32 CompiledMaxHistLogLevel;		__le32 compiled_max_hist_log_level;
	u8 CustomBoardName[12];		u8 custom_board_name[12];
	u16 SupportedCntlrMode; /* identify supported controller mode */		u16 supported_cntlr_mode; /* identify supported controller mode */
	u16 ReservedForFuture16;		u16 reserved_for_future16;
	__le32 SupportedOptions3; /* reserved for future options */		__le32 supported_options3; /* reserved for future options */

	__le16 VirtDeviceBus; /* virt. SCSI device for Thor */		__le16 virt_device_bus; /* virt. SCSI device for Thor */
	__le16 VirtDeviceTarget;		__le16 virt_device_target;
	__le16 VirtDeviceLUN;		__le16 virt_device_lun;
	__le16 Unused;		__le16 unused;
	__le32 ReservedForFutureGrowth[68];		__le32 reserved_for_future_growth[68];

	};		};
	#define AAC_FEATURE_FALCON cpu_to_le32(0x00000010)		#define AAC_FEATURE_FALCON cpu_to_le32(0x00000010)

drivers/scsi/aacraid/commsup.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1815,7 +1815,7 @@ int aac_check_health(struct aac_dev * aac)
	printk(KERN_ERR "%s: Host adapter BLINK LED 0x%x\n", aac->name, BlinkLED);		printk(KERN_ERR "%s: Host adapter BLINK LED 0x%x\n", aac->name, BlinkLED);

	if (!aac_check_reset \|\| ((aac_check_reset == 1) &&		if (!aac_check_reset \|\| ((aac_check_reset == 1) &&
	(aac->supplement_adapter_info.SupportedOptions2 &		(aac->supplement_adapter_info.supported_options2 &
	AAC_OPTION_IGNORE_RESET)))		AAC_OPTION_IGNORE_RESET)))
	goto out;		goto out;
	host = aac->scsi_host_ptr;		host = aac->scsi_host_ptr;
	@@ -2264,8 +2264,8 @@ static int aac_send_wellness_command(struct aac_dev dev, char wellness_str,

	aac_fib_init(fibptr);		aac_fib_init(fibptr);

	vbus = (u32)le16_to_cpu(dev->supplement_adapter_info.VirtDeviceBus);		vbus = (u32)le16_to_cpu(dev->supplement_adapter_info.virt_device_bus);
	vid = (u32)le16_to_cpu(dev->supplement_adapter_info.VirtDeviceTarget);		vid = (u32)le16_to_cpu(dev->supplement_adapter_info.virt_device_target);

	srbcmd = (struct aac_srb *)fib_data(fibptr);		srbcmd = (struct aac_srb *)fib_data(fibptr);

drivers/scsi/aacraid/linit.c

+17 −15

Original line number	Original line	Diff line number	Diff line
	@@ -891,13 +891,13 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
	* Adapters that support a register, instead of a commanded,		* Adapters that support a register, instead of a commanded,
	* reset.		* reset.
	*/		*/
	if (((aac->supplement_adapter_info.SupportedOptions2 &		if (((aac->supplement_adapter_info.supported_options2 &
	AAC_OPTION_MU_RESET) \|\|		AAC_OPTION_MU_RESET) \|\|
	(aac->supplement_adapter_info.SupportedOptions2 &		(aac->supplement_adapter_info.supported_options2 &
	AAC_OPTION_DOORBELL_RESET)) &&		AAC_OPTION_DOORBELL_RESET)) &&
	aac_check_reset &&		aac_check_reset &&
	((aac_check_reset != 1) \|\|		((aac_check_reset != 1) \|\|
	!(aac->supplement_adapter_info.SupportedOptions2 &		!(aac->supplement_adapter_info.supported_options2 &
	AAC_OPTION_IGNORE_RESET))) {		AAC_OPTION_IGNORE_RESET))) {
	/* Bypass wait for command quiesce */		/* Bypass wait for command quiesce */
	aac_reset_adapter(aac, 2, IOP_HWSOFT_RESET);		aac_reset_adapter(aac, 2, IOP_HWSOFT_RESET);
	@@ -1029,8 +1029,8 @@ static ssize_t aac_show_model(struct device *device,
	struct aac_dev dev = (struct aac_dev)class_to_shost(device)->hostdata;		struct aac_dev dev = (struct aac_dev)class_to_shost(device)->hostdata;
	int len;		int len;

	if (dev->supplement_adapter_info.AdapterTypeText[0]) {		if (dev->supplement_adapter_info.adapter_type_text[0]) {
	char * cp = dev->supplement_adapter_info.AdapterTypeText;		char *cp = dev->supplement_adapter_info.adapter_type_text;
	while (cp && cp != ' ')		while (cp && cp != ' ')
	++cp;		++cp;
	while (*cp == ' ')		while (*cp == ' ')
	@@ -1046,15 +1046,17 @@ static ssize_t aac_show_vendor(struct device *device,
	struct device_attribute attr, char buf)		struct device_attribute attr, char buf)
	{		{
	struct aac_dev dev = (struct aac_dev)class_to_shost(device)->hostdata;		struct aac_dev dev = (struct aac_dev)class_to_shost(device)->hostdata;
			struct aac_supplement_adapter_info *sup_adap_info;
	int len;		int len;

	if (dev->supplement_adapter_info.AdapterTypeText[0]) {		sup_adap_info = &dev->supplement_adapter_info;
	char * cp = dev->supplement_adapter_info.AdapterTypeText;		if (sup_adap_info->adapter_type_text[0]) {
			char *cp = sup_adap_info->adapter_type_text;
	while (cp && cp != ' ')		while (cp && cp != ' ')
	++cp;		++cp;
	len = snprintf(buf, PAGE_SIZE, "%.*s\n",		len = snprintf(buf, PAGE_SIZE, "%.*s\n",
	(int)(cp - (char *)dev->supplement_adapter_info.AdapterTypeText),		(int)(cp - (char *)sup_adap_info->adapter_type_text),
	dev->supplement_adapter_info.AdapterTypeText);		sup_adap_info->adapter_type_text);
	} else		} else
	len = snprintf(buf, PAGE_SIZE, "%s\n",		len = snprintf(buf, PAGE_SIZE, "%s\n",
	aac_drivers[dev->cardtype].vname);		aac_drivers[dev->cardtype].vname);
	@@ -1078,7 +1080,7 @@ static ssize_t aac_show_flags(struct device *cdev,
	"SAI_READ_CAPACITY_16\n");		"SAI_READ_CAPACITY_16\n");
	if (dev->jbod)		if (dev->jbod)
	len += snprintf(buf + len, PAGE_SIZE - len, "SUPPORTED_JBOD\n");		len += snprintf(buf + len, PAGE_SIZE - len, "SUPPORTED_JBOD\n");
	if (dev->supplement_adapter_info.SupportedOptions2 &		if (dev->supplement_adapter_info.supported_options2 &
	AAC_OPTION_POWER_MANAGEMENT)		AAC_OPTION_POWER_MANAGEMENT)
	len += snprintf(buf + len, PAGE_SIZE - len,		len += snprintf(buf + len, PAGE_SIZE - len,
	"SUPPORTED_POWER_MANAGEMENT\n");		"SUPPORTED_POWER_MANAGEMENT\n");
	@@ -1139,12 +1141,12 @@ static ssize_t aac_show_serial_number(struct device *device,
	len = snprintf(buf, 16, "%06X\n",		len = snprintf(buf, 16, "%06X\n",
	le32_to_cpu(dev->adapter_info.serial[0]));		le32_to_cpu(dev->adapter_info.serial[0]));
	if (len &&		if (len &&
	!memcmp(&dev->supplement_adapter_info.MfgPcbaSerialNo[		!memcmp(&dev->supplement_adapter_info.mfg_pcba_serial_no[
	sizeof(dev->supplement_adapter_info.MfgPcbaSerialNo)-len],		sizeof(dev->supplement_adapter_info.mfg_pcba_serial_no)-len],
	buf, len-1))		buf, len-1))
	len = snprintf(buf, 16, "%.*s\n",		len = snprintf(buf, 16, "%.*s\n",
	(int)sizeof(dev->supplement_adapter_info.MfgPcbaSerialNo),		(int)sizeof(dev->supplement_adapter_info.mfg_pcba_serial_no),
	dev->supplement_adapter_info.MfgPcbaSerialNo);		dev->supplement_adapter_info.mfg_pcba_serial_no);

	return min(len, 16);		return min(len, 16);
	}		}

drivers/scsi/aacraid/rx.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -475,7 +475,7 @@ static int aac_rx_restart_adapter(struct aac_dev *dev, int bled, u8 reset_type)
	{		{
	u32 var = 0;		u32 var = 0;

	if (!(dev->supplement_adapter_info.SupportedOptions2 &		if (!(dev->supplement_adapter_info.supported_options2 &
	AAC_OPTION_MU_RESET) \|\| (bled >= 0) \|\| (bled == -2)) {		AAC_OPTION_MU_RESET) \|\| (bled >= 0) \|\| (bled == -2)) {
	if (bled)		if (bled)
	printk(KERN_ERR "%s%d: adapter kernel panic'd %x.\n",		printk(KERN_ERR "%s%d: adapter kernel panic'd %x.\n",