hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: smartpqi: minor driver cleanup 

- remove debug code that is no longer necessary.
   - Some WARN_ON checks were removed because the driver continues
     to function when the conditions are met.
 - remove a MACRO that is no longer used.
 - remove unnecessary multi-line statements.

Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Kevin Barnett 2017-05-03 18:53:48 -05:00 committed by Martin K. Petersen
parent 1be42f46ad
commit cbe0c7b11d
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/smartpqi/smartpqi.h
View File

@ -1053,7 +1053,7 @@ enum pqi_ctrl_mode {
#define BMIC_WRITE_HOST_WELLNESS 0xa5 #define BMIC_WRITE_HOST_WELLNESS 0xa5
#define BMIC_CACHE_FLUSH 0xc2 #define BMIC_CACHE_FLUSH 0xc2
#define SA_CACHE_FLUSH 0x01 #define SA_CACHE_FLUSH 0x1
#define MASKED_DEVICE(lunid) ((lunid)[3] & 0xc0) #define MASKED_DEVICE(lunid) ((lunid)[3] & 0xc0)
#define CISS_GET_BUS(lunid) ((lunid)[7] & 0x3f) #define CISS_GET_BUS(lunid) ((lunid)[7] & 0x3f)

38
drivers/scsi/smartpqi/smartpqi_init.c
View File

@ -57,8 +57,6 @@ MODULE_SUPPORTED_DEVICE("Microsemi Smart Family Controllers");
MODULE_VERSION(DRIVER_VERSION); MODULE_VERSION(DRIVER_VERSION);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define PQI_ENABLE_MULTI_QUEUE_SUPPORT 0
static char *hpe_branded_controller = "HPE Smart Array Controller"; static char *hpe_branded_controller = "HPE Smart Array Controller";
static char *microsemi_branded_controller = "Microsemi Smart Family Controller"; static char *microsemi_branded_controller = "Microsemi Smart Family Controller";
@ -94,7 +92,7 @@ static unsigned int pqi_supported_event_types[] = {
static int pqi_disable_device_id_wildcards; static int pqi_disable_device_id_wildcards;
module_param_named(disable_device_id_wildcards, module_param_named(disable_device_id_wildcards,
pqi_disable_device_id_wildcards, int, S_IRUGO | S_IWUSR); pqi_disable_device_id_wildcards, int, 0644);
MODULE_PARM_DESC(disable_device_id_wildcards, MODULE_PARM_DESC(disable_device_id_wildcards,
"Disable device ID wildcards."); "Disable device ID wildcards.");
@ -383,7 +381,6 @@ static int pqi_build_raid_path_request(struct pqi_ctrl_info *ctrl_info,
default: default:
dev_err(&ctrl_info->pci_dev->dev, "unknown command 0x%c\n", dev_err(&ctrl_info->pci_dev->dev, "unknown command 0x%c\n",
cmd); cmd);
WARN_ON(cmd);
break; break;
} }
@ -1133,10 +1130,8 @@ static int pqi_get_device_info(struct pqi_ctrl_info *ctrl_info,
scsi_sanitize_inquiry_string(&buffer[16], 16); scsi_sanitize_inquiry_string(&buffer[16], 16);
device->devtype = buffer[0] & 0x1f; device->devtype = buffer[0] & 0x1f;
memcpy(device->vendor, &buffer[8], memcpy(device->vendor, &buffer[8], sizeof(device->vendor));
sizeof(device->vendor)); memcpy(device->model, &buffer[16], sizeof(device->model));
memcpy(device->model, &buffer[16],
sizeof(device->model));
if (pqi_is_logical_device(device) && device->devtype == TYPE_DISK) { if (pqi_is_logical_device(device) && device->devtype == TYPE_DISK) {
pqi_get_raid_level(ctrl_info, device); pqi_get_raid_level(ctrl_info, device);
@ -1607,9 +1602,6 @@ static void pqi_update_device_list(struct pqi_ctrl_info *ctrl_info,
*/ */
device->new_device = true; device->new_device = true;
break; break;
default:
WARN_ON(find_result);
break;
} }
} }
@ -1742,7 +1734,7 @@ static inline bool pqi_skip_device(u8 *scsi3addr,
return false; return false;
} }
static inline bool pqi_expose_device(struct pqi_scsi_dev *device) static inline bool pqi_ok_to_expose_device(struct pqi_scsi_dev *device)
{ {
/* Expose all devices except for physical devices that are masked. */ /* Expose all devices except for physical devices that are masked. */
if (device->is_physical_device && MASKED_DEVICE(device->scsi3addr)) if (device->is_physical_device && MASKED_DEVICE(device->scsi3addr))
@ -1883,7 +1875,7 @@ static int pqi_update_scsi_devices(struct pqi_ctrl_info *ctrl_info)
pqi_assign_bus_target_lun(device); pqi_assign_bus_target_lun(device);
device->expose_device = pqi_expose_device(device); device->expose_device = pqi_ok_to_expose_device(device);
if (device->is_physical_device) { if (device->is_physical_device) {
device->wwid = phys_lun_ext_entry->wwid; device->wwid = phys_lun_ext_entry->wwid;
@ -2682,7 +2674,6 @@ static unsigned int pqi_process_io_intr(struct pqi_ctrl_info *ctrl_info,
dev_err(&ctrl_info->pci_dev->dev, dev_err(&ctrl_info->pci_dev->dev,
"unexpected IU type: 0x%x\n", "unexpected IU type: 0x%x\n",
response->header.iu_type); response->header.iu_type);
WARN_ON(response->header.iu_type);
break; break;
} }
@ -4642,7 +4633,6 @@ static int pqi_raid_submit_scsi_cmd(struct pqi_ctrl_info *ctrl_info,
dev_err(&ctrl_info->pci_dev->dev, dev_err(&ctrl_info->pci_dev->dev,
"unknown data direction: %d\n", "unknown data direction: %d\n",
scmd->sc_data_direction); scmd->sc_data_direction);
WARN_ON(scmd->sc_data_direction);
break; break;
} }
@ -4725,7 +4715,6 @@ static int pqi_aio_submit_io(struct pqi_ctrl_info *ctrl_info,
dev_err(&ctrl_info->pci_dev->dev, dev_err(&ctrl_info->pci_dev->dev,
"unknown data direction: %d\n", "unknown data direction: %d\n",
scmd->sc_data_direction); scmd->sc_data_direction);
WARN_ON(scmd->sc_data_direction);
break; break;
} }
@ -5485,8 +5474,8 @@ static ssize_t pqi_host_rescan_store(struct device *dev,
return count; return count;
} }
static DEVICE_ATTR(version, S_IRUGO, pqi_version_show, NULL); static DEVICE_ATTR(version, 0444, pqi_version_show, NULL);
static DEVICE_ATTR(rescan, S_IWUSR, NULL, pqi_host_rescan_store); static DEVICE_ATTR(rescan, 0200, NULL, pqi_host_rescan_store);
static struct device_attribute *pqi_shost_attrs[] = { static struct device_attribute *pqi_shost_attrs[] = {
&dev_attr_version, &dev_attr_version,
@ -5544,8 +5533,8 @@ static ssize_t pqi_ssd_smart_path_enabled_show(struct device *dev,
return 2; return 2;
} }
static DEVICE_ATTR(sas_address, S_IRUGO, pqi_sas_address_show, NULL); static DEVICE_ATTR(sas_address, 0444, pqi_sas_address_show, NULL);
static DEVICE_ATTR(ssd_smart_path_enabled, S_IRUGO, static DEVICE_ATTR(ssd_smart_path_enabled, 0444,
pqi_ssd_smart_path_enabled_show, NULL); pqi_ssd_smart_path_enabled_show, NULL);
static struct device_attribute *pqi_sdev_attrs[] = { static struct device_attribute *pqi_sdev_attrs[] = {
@ -6108,9 +6097,6 @@ static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)
goto release_regions; goto release_regions;
} }
ctrl_info->registers = ctrl_info->iomem_base;
ctrl_info->pqi_registers = &ctrl_info->registers->pqi_registers;
#define PCI_EXP_COMP_TIMEOUT_65_TO_210_MS 0x6 #define PCI_EXP_COMP_TIMEOUT_65_TO_210_MS 0x6
/* Increase the PCIe completion timeout. */ /* Increase the PCIe completion timeout. */
@ -6125,6 +6111,9 @@ static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)
/* Enable bus mastering. */ /* Enable bus mastering. */
pci_set_master(ctrl_info->pci_dev); pci_set_master(ctrl_info->pci_dev);
ctrl_info->registers = ctrl_info->iomem_base;
ctrl_info->pqi_registers = &ctrl_info->registers->pqi_registers;
pci_set_drvdata(ctrl_info->pci_dev, ctrl_info); pci_set_drvdata(ctrl_info->pci_dev, ctrl_info);
return 0; return 0;
@ -6141,7 +6130,8 @@ static void pqi_cleanup_pci_init(struct pqi_ctrl_info *ctrl_info)
{ {
iounmap(ctrl_info->iomem_base); iounmap(ctrl_info->iomem_base);
pci_release_regions(ctrl_info->pci_dev); pci_release_regions(ctrl_info->pci_dev);
pci_disable_device(ctrl_info->pci_dev); if (pci_is_enabled(ctrl_info->pci_dev))
pci_disable_device(ctrl_info->pci_dev);
pci_set_drvdata(ctrl_info->pci_dev, NULL); pci_set_drvdata(ctrl_info->pci_dev, NULL);
} }