aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ipr.c
diff options
context:
space:
mode:
authorKleber Sacilotto de Souza <klebers@linux.vnet.ibm.com>2012-08-22 17:14:14 -0400
committerJames Bottomley <JBottomley@Parallels.com>2012-09-24 04:10:58 -0400
commit9728686f17304bd682038664d9a1ad28b7409af8 (patch)
tree2889fbd2d791ad1d40ebba0a15808c1ba2eee85b /drivers/scsi/ipr.c
parent744abef1ab0d9f714ecd98b6ce66b70967a12b9b (diff)
[SCSI] ipr: trivial: fix small coding style issues
Signed-off-by: Kleber Sacilotto de Souza <klebers@linux.vnet.ibm.com> Acked-by: Brian King <brking@linux.vnet.ibm.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/ipr.c')
-rw-r--r--drivers/scsi/ipr.c66
1 files changed, 33 insertions, 33 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index fc49f173fbb5..ec8abb08cb71 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -192,7 +192,7 @@ static const struct ipr_chip_t ipr_chip[] = {
192 { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROCODILE, IPR_USE_MSI, IPR_SIS64, IPR_MMIO, &ipr_chip_cfg[2] } 192 { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROCODILE, IPR_USE_MSI, IPR_SIS64, IPR_MMIO, &ipr_chip_cfg[2] }
193}; 193};
194 194
195static int ipr_max_bus_speeds [] = { 195static int ipr_max_bus_speeds[] = {
196 IPR_80MBs_SCSI_RATE, IPR_U160_SCSI_RATE, IPR_U320_SCSI_RATE 196 IPR_80MBs_SCSI_RATE, IPR_U160_SCSI_RATE, IPR_U320_SCSI_RATE
197}; 197};
198 198
@@ -562,7 +562,7 @@ static void ipr_trc_hook(struct ipr_cmnd *ipr_cmd,
562 trace_entry->u.add_data = add_data; 562 trace_entry->u.add_data = add_data;
563} 563}
564#else 564#else
565#define ipr_trc_hook(ipr_cmd, type, add_data) do { } while(0) 565#define ipr_trc_hook(ipr_cmd, type, add_data) do { } while (0)
566#endif 566#endif
567 567
568/** 568/**
@@ -1035,7 +1035,7 @@ static void ipr_send_hcam(struct ipr_ioa_cfg *ioa_cfg, u8 type,
1035 **/ 1035 **/
1036static void ipr_update_ata_class(struct ipr_resource_entry *res, unsigned int proto) 1036static void ipr_update_ata_class(struct ipr_resource_entry *res, unsigned int proto)
1037{ 1037{
1038 switch(proto) { 1038 switch (proto) {
1039 case IPR_PROTO_SATA: 1039 case IPR_PROTO_SATA:
1040 case IPR_PROTO_SAS_STP: 1040 case IPR_PROTO_SAS_STP:
1041 res->ata_class = ATA_DEV_ATA; 1041 res->ata_class = ATA_DEV_ATA;
@@ -3076,7 +3076,7 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump)
3076} 3076}
3077 3077
3078#else 3078#else
3079#define ipr_get_ioa_dump(ioa_cfg, dump) do { } while(0) 3079#define ipr_get_ioa_dump(ioa_cfg, dump) do { } while (0)
3080#endif 3080#endif
3081 3081
3082/** 3082/**
@@ -3088,7 +3088,7 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump)
3088 **/ 3088 **/
3089static void ipr_release_dump(struct kref *kref) 3089static void ipr_release_dump(struct kref *kref)
3090{ 3090{
3091 struct ipr_dump *dump = container_of(kref,struct ipr_dump,kref); 3091 struct ipr_dump *dump = container_of(kref, struct ipr_dump, kref);
3092 struct ipr_ioa_cfg *ioa_cfg = dump->ioa_cfg; 3092 struct ipr_ioa_cfg *ioa_cfg = dump->ioa_cfg;
3093 unsigned long lock_flags = 0; 3093 unsigned long lock_flags = 0;
3094 int i; 3094 int i;
@@ -3175,7 +3175,7 @@ restart:
3175 break; 3175 break;
3176 } 3176 }
3177 } 3177 }
3178 } while(did_work); 3178 } while (did_work);
3179 3179
3180 list_for_each_entry(res, &ioa_cfg->used_res_q, queue) { 3180 list_for_each_entry(res, &ioa_cfg->used_res_q, queue) {
3181 if (res->add_to_ml) { 3181 if (res->add_to_ml) {
@@ -3301,7 +3301,7 @@ static ssize_t ipr_show_log_level(struct device *dev,
3301 * number of bytes printed to buffer 3301 * number of bytes printed to buffer
3302 **/ 3302 **/
3303static ssize_t ipr_store_log_level(struct device *dev, 3303static ssize_t ipr_store_log_level(struct device *dev,
3304 struct device_attribute *attr, 3304 struct device_attribute *attr,
3305 const char *buf, size_t count) 3305 const char *buf, size_t count)
3306{ 3306{
3307 struct Scsi_Host *shost = class_to_shost(dev); 3307 struct Scsi_Host *shost = class_to_shost(dev);
@@ -3348,7 +3348,7 @@ static ssize_t ipr_store_diagnostics(struct device *dev,
3348 return -EACCES; 3348 return -EACCES;
3349 3349
3350 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 3350 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
3351 while(ioa_cfg->in_reset_reload) { 3351 while (ioa_cfg->in_reset_reload) {
3352 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); 3352 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
3353 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 3353 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
3354 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 3354 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
@@ -3715,7 +3715,7 @@ static int ipr_update_ioa_ucode(struct ipr_ioa_cfg *ioa_cfg,
3715 unsigned long lock_flags; 3715 unsigned long lock_flags;
3716 3716
3717 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 3717 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
3718 while(ioa_cfg->in_reset_reload) { 3718 while (ioa_cfg->in_reset_reload) {
3719 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); 3719 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
3720 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 3720 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
3721 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 3721 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
@@ -3779,7 +3779,7 @@ static ssize_t ipr_store_update_fw(struct device *dev,
3779 len = snprintf(fname, 99, "%s", buf); 3779 len = snprintf(fname, 99, "%s", buf);
3780 fname[len-1] = '\0'; 3780 fname[len-1] = '\0';
3781 3781
3782 if(request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) { 3782 if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) {
3783 dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname); 3783 dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname);
3784 return -EIO; 3784 return -EIO;
3785 } 3785 }
@@ -4645,7 +4645,7 @@ static int ipr_slave_alloc(struct scsi_device *sdev)
4645 * Return value: 4645 * Return value:
4646 * SUCCESS / FAILED 4646 * SUCCESS / FAILED
4647 **/ 4647 **/
4648static int __ipr_eh_host_reset(struct scsi_cmnd * scsi_cmd) 4648static int __ipr_eh_host_reset(struct scsi_cmnd *scsi_cmd)
4649{ 4649{
4650 struct ipr_ioa_cfg *ioa_cfg; 4650 struct ipr_ioa_cfg *ioa_cfg;
4651 int rc; 4651 int rc;
@@ -4667,7 +4667,7 @@ static int __ipr_eh_host_reset(struct scsi_cmnd * scsi_cmd)
4667 return rc; 4667 return rc;
4668} 4668}
4669 4669
4670static int ipr_eh_host_reset(struct scsi_cmnd * cmd) 4670static int ipr_eh_host_reset(struct scsi_cmnd *cmd)
4671{ 4671{
4672 int rc; 4672 int rc;
4673 4673
@@ -4734,7 +4734,7 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg,
4734 } 4734 }
4735 4735
4736 LEAVE; 4736 LEAVE;
4737 return (IPR_IOASC_SENSE_KEY(ioasc) ? -EIO : 0); 4737 return IPR_IOASC_SENSE_KEY(ioasc) ? -EIO : 0;
4738} 4738}
4739 4739
4740/** 4740/**
@@ -4758,7 +4758,7 @@ static int ipr_sata_reset(struct ata_link *link, unsigned int *classes,
4758 4758
4759 ENTER; 4759 ENTER;
4760 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 4760 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
4761 while(ioa_cfg->in_reset_reload) { 4761 while (ioa_cfg->in_reset_reload) {
4762 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); 4762 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
4763 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 4763 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
4764 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 4764 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
@@ -4786,7 +4786,7 @@ static int ipr_sata_reset(struct ata_link *link, unsigned int *classes,
4786 * Return value: 4786 * Return value:
4787 * SUCCESS / FAILED 4787 * SUCCESS / FAILED
4788 **/ 4788 **/
4789static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd) 4789static int __ipr_eh_dev_reset(struct scsi_cmnd *scsi_cmd)
4790{ 4790{
4791 struct ipr_cmnd *ipr_cmd; 4791 struct ipr_cmnd *ipr_cmd;
4792 struct ipr_ioa_cfg *ioa_cfg; 4792 struct ipr_ioa_cfg *ioa_cfg;
@@ -4844,10 +4844,10 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd)
4844 res->resetting_device = 0; 4844 res->resetting_device = 0;
4845 4845
4846 LEAVE; 4846 LEAVE;
4847 return (rc ? FAILED : SUCCESS); 4847 return rc ? FAILED : SUCCESS;
4848} 4848}
4849 4849
4850static int ipr_eh_dev_reset(struct scsi_cmnd * cmd) 4850static int ipr_eh_dev_reset(struct scsi_cmnd *cmd)
4851{ 4851{
4852 int rc; 4852 int rc;
4853 4853
@@ -4943,7 +4943,7 @@ static void ipr_abort_timeout(struct ipr_cmnd *ipr_cmd)
4943 * Return value: 4943 * Return value:
4944 * SUCCESS / FAILED 4944 * SUCCESS / FAILED
4945 **/ 4945 **/
4946static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd) 4946static int ipr_cancel_op(struct scsi_cmnd *scsi_cmd)
4947{ 4947{
4948 struct ipr_cmnd *ipr_cmd; 4948 struct ipr_cmnd *ipr_cmd;
4949 struct ipr_ioa_cfg *ioa_cfg; 4949 struct ipr_ioa_cfg *ioa_cfg;
@@ -5012,7 +5012,7 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
5012 res->needs_sync_complete = 1; 5012 res->needs_sync_complete = 1;
5013 5013
5014 LEAVE; 5014 LEAVE;
5015 return (IPR_IOASC_SENSE_KEY(ioasc) ? FAILED : SUCCESS); 5015 return IPR_IOASC_SENSE_KEY(ioasc) ? FAILED : SUCCESS;
5016} 5016}
5017 5017
5018/** 5018/**
@@ -5022,7 +5022,7 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
5022 * Return value: 5022 * Return value:
5023 * SUCCESS / FAILED 5023 * SUCCESS / FAILED
5024 **/ 5024 **/
5025static int ipr_eh_abort(struct scsi_cmnd * scsi_cmd) 5025static int ipr_eh_abort(struct scsi_cmnd *scsi_cmd)
5026{ 5026{
5027 unsigned long flags; 5027 unsigned long flags;
5028 int rc; 5028 int rc;
@@ -5976,7 +5976,7 @@ static int ipr_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
5976 * Return value: 5976 * Return value:
5977 * pointer to buffer with description string 5977 * pointer to buffer with description string
5978 **/ 5978 **/
5979static const char * ipr_ioa_info(struct Scsi_Host *host) 5979static const char *ipr_ioa_info(struct Scsi_Host *host)
5980{ 5980{
5981 static char buffer[512]; 5981 static char buffer[512];
5982 struct ipr_ioa_cfg *ioa_cfg; 5982 struct ipr_ioa_cfg *ioa_cfg;
@@ -6034,7 +6034,7 @@ static void ipr_ata_phy_reset(struct ata_port *ap)
6034 6034
6035 ENTER; 6035 ENTER;
6036 spin_lock_irqsave(ioa_cfg->host->host_lock, flags); 6036 spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
6037 while(ioa_cfg->in_reset_reload) { 6037 while (ioa_cfg->in_reset_reload) {
6038 spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags); 6038 spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
6039 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 6039 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
6040 spin_lock_irqsave(ioa_cfg->host->host_lock, flags); 6040 spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
@@ -6074,7 +6074,7 @@ static void ipr_ata_post_internal(struct ata_queued_cmd *qc)
6074 unsigned long flags; 6074 unsigned long flags;
6075 6075
6076 spin_lock_irqsave(ioa_cfg->host->host_lock, flags); 6076 spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
6077 while(ioa_cfg->in_reset_reload) { 6077 while (ioa_cfg->in_reset_reload) {
6078 spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags); 6078 spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
6079 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 6079 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
6080 spin_lock_irqsave(ioa_cfg->host->host_lock, flags); 6080 spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
@@ -6399,7 +6399,7 @@ static int ipr_invalid_adapter(struct ipr_ioa_cfg *ioa_cfg)
6399 int i; 6399 int i;
6400 6400
6401 if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) { 6401 if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) {
6402 for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){ 6402 for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++) {
6403 if (__is_processor(ipr_blocked_processors[i])) 6403 if (__is_processor(ipr_blocked_processors[i]))
6404 return 1; 6404 return 1;
6405 } 6405 }
@@ -6677,7 +6677,7 @@ static void ipr_scsi_bus_speed_limit(struct ipr_ioa_cfg *ioa_cfg)
6677 * none 6677 * none
6678 **/ 6678 **/
6679static void ipr_modify_ioafp_mode_page_28(struct ipr_ioa_cfg *ioa_cfg, 6679static void ipr_modify_ioafp_mode_page_28(struct ipr_ioa_cfg *ioa_cfg,
6680 struct ipr_mode_pages *mode_pages) 6680 struct ipr_mode_pages *mode_pages)
6681{ 6681{
6682 int i, entry_length; 6682 int i, entry_length;
6683 struct ipr_dev_bus_entry *bus; 6683 struct ipr_dev_bus_entry *bus;
@@ -8091,7 +8091,7 @@ static void ipr_reset_ioa_job(struct ipr_cmnd *ipr_cmd)
8091 ipr_reinit_ipr_cmnd(ipr_cmd); 8091 ipr_reinit_ipr_cmnd(ipr_cmd);
8092 ipr_cmd->job_step_failed = ipr_reset_cmd_failed; 8092 ipr_cmd->job_step_failed = ipr_reset_cmd_failed;
8093 rc = ipr_cmd->job_step(ipr_cmd); 8093 rc = ipr_cmd->job_step(ipr_cmd);
8094 } while(rc == IPR_RC_JOB_CONTINUE); 8094 } while (rc == IPR_RC_JOB_CONTINUE);
8095} 8095}
8096 8096
8097/** 8097/**
@@ -8352,7 +8352,7 @@ static void ipr_free_cmd_blks(struct ipr_ioa_cfg *ioa_cfg)
8352 } 8352 }
8353 8353
8354 if (ioa_cfg->ipr_cmd_pool) 8354 if (ioa_cfg->ipr_cmd_pool)
8355 pci_pool_destroy (ioa_cfg->ipr_cmd_pool); 8355 pci_pool_destroy(ioa_cfg->ipr_cmd_pool);
8356 8356
8357 kfree(ioa_cfg->ipr_cmnd_list); 8357 kfree(ioa_cfg->ipr_cmnd_list);
8358 kfree(ioa_cfg->ipr_cmnd_list_dma); 8358 kfree(ioa_cfg->ipr_cmnd_list_dma);
@@ -8432,8 +8432,8 @@ static int __devinit ipr_alloc_cmd_blks(struct ipr_ioa_cfg *ioa_cfg)
8432 dma_addr_t dma_addr; 8432 dma_addr_t dma_addr;
8433 int i; 8433 int i;
8434 8434
8435 ioa_cfg->ipr_cmd_pool = pci_pool_create (IPR_NAME, ioa_cfg->pdev, 8435 ioa_cfg->ipr_cmd_pool = pci_pool_create(IPR_NAME, ioa_cfg->pdev,
8436 sizeof(struct ipr_cmnd), 512, 0); 8436 sizeof(struct ipr_cmnd), 512, 0);
8437 8437
8438 if (!ioa_cfg->ipr_cmd_pool) 8438 if (!ioa_cfg->ipr_cmd_pool)
8439 return -ENOMEM; 8439 return -ENOMEM;
@@ -8447,7 +8447,7 @@ static int __devinit ipr_alloc_cmd_blks(struct ipr_ioa_cfg *ioa_cfg)
8447 } 8447 }
8448 8448
8449 for (i = 0; i < IPR_NUM_CMD_BLKS; i++) { 8449 for (i = 0; i < IPR_NUM_CMD_BLKS; i++) {
8450 ipr_cmd = pci_pool_alloc (ioa_cfg->ipr_cmd_pool, GFP_KERNEL, &dma_addr); 8450 ipr_cmd = pci_pool_alloc(ioa_cfg->ipr_cmd_pool, GFP_KERNEL, &dma_addr);
8451 8451
8452 if (!ipr_cmd) { 8452 if (!ipr_cmd) {
8453 ipr_free_cmd_blks(ioa_cfg); 8453 ipr_free_cmd_blks(ioa_cfg);
@@ -9032,7 +9032,7 @@ static void ipr_scan_vsets(struct ipr_ioa_cfg *ioa_cfg)
9032 int target, lun; 9032 int target, lun;
9033 9033
9034 for (target = 0; target < IPR_MAX_NUM_TARGETS_PER_BUS; target++) 9034 for (target = 0; target < IPR_MAX_NUM_TARGETS_PER_BUS; target++)
9035 for (lun = 0; lun < IPR_MAX_NUM_VSET_LUNS_PER_TARGET; lun++ ) 9035 for (lun = 0; lun < IPR_MAX_NUM_VSET_LUNS_PER_TARGET; lun++)
9036 scsi_add_device(ioa_cfg->host, IPR_VSET_BUS, target, lun); 9036 scsi_add_device(ioa_cfg->host, IPR_VSET_BUS, target, lun);
9037} 9037}
9038 9038
@@ -9078,7 +9078,7 @@ static void __ipr_remove(struct pci_dev *pdev)
9078 ENTER; 9078 ENTER;
9079 9079
9080 spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags); 9080 spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);
9081 while(ioa_cfg->in_reset_reload) { 9081 while (ioa_cfg->in_reset_reload) {
9082 spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags); 9082 spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);
9083 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 9083 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
9084 spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags); 9084 spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);
@@ -9207,7 +9207,7 @@ static void ipr_shutdown(struct pci_dev *pdev)
9207 unsigned long lock_flags = 0; 9207 unsigned long lock_flags = 0;
9208 9208
9209 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 9209 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
9210 while(ioa_cfg->in_reset_reload) { 9210 while (ioa_cfg->in_reset_reload) {
9211 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); 9211 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
9212 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 9212 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
9213 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 9213 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);