diff options
author | Kleber Sacilotto de Souza <klebers@linux.vnet.ibm.com> | 2012-08-22 17:14:14 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-09-01 13:27:14 -0400 |
commit | 203fa3fe9c9d79b3f4cd044cab13622123b6c578 (patch) | |
tree | 657433b1523b5f2a0b6397b58b2e4eac480ad349 /drivers/scsi/ipr.c | |
parent | 1557cc4211951ba92a318d1ddf743448637d1d3f (diff) |
ipr: fix small coding style issues
Fixing small trivial 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: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/scsi/ipr.c')
-rw-r--r-- | drivers/scsi/ipr.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 467dc38246f9..1059c99690e6 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 | ||
195 | static int ipr_max_bus_speeds [] = { | 195 | static 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 | /** |
@@ -1002,7 +1002,7 @@ static void ipr_send_hcam(struct ipr_ioa_cfg *ioa_cfg, u8 type, | |||
1002 | **/ | 1002 | **/ |
1003 | static void ipr_update_ata_class(struct ipr_resource_entry *res, unsigned int proto) | 1003 | static void ipr_update_ata_class(struct ipr_resource_entry *res, unsigned int proto) |
1004 | { | 1004 | { |
1005 | switch(proto) { | 1005 | switch (proto) { |
1006 | case IPR_PROTO_SATA: | 1006 | case IPR_PROTO_SATA: |
1007 | case IPR_PROTO_SAS_STP: | 1007 | case IPR_PROTO_SAS_STP: |
1008 | res->ata_class = ATA_DEV_ATA; | 1008 | res->ata_class = ATA_DEV_ATA; |
@@ -3043,7 +3043,7 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump) | |||
3043 | } | 3043 | } |
3044 | 3044 | ||
3045 | #else | 3045 | #else |
3046 | #define ipr_get_ioa_dump(ioa_cfg, dump) do { } while(0) | 3046 | #define ipr_get_ioa_dump(ioa_cfg, dump) do { } while (0) |
3047 | #endif | 3047 | #endif |
3048 | 3048 | ||
3049 | /** | 3049 | /** |
@@ -3055,7 +3055,7 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump) | |||
3055 | **/ | 3055 | **/ |
3056 | static void ipr_release_dump(struct kref *kref) | 3056 | static void ipr_release_dump(struct kref *kref) |
3057 | { | 3057 | { |
3058 | struct ipr_dump *dump = container_of(kref,struct ipr_dump,kref); | 3058 | struct ipr_dump *dump = container_of(kref, struct ipr_dump, kref); |
3059 | struct ipr_ioa_cfg *ioa_cfg = dump->ioa_cfg; | 3059 | struct ipr_ioa_cfg *ioa_cfg = dump->ioa_cfg; |
3060 | unsigned long lock_flags = 0; | 3060 | unsigned long lock_flags = 0; |
3061 | int i; | 3061 | int i; |
@@ -3142,7 +3142,7 @@ restart: | |||
3142 | break; | 3142 | break; |
3143 | } | 3143 | } |
3144 | } | 3144 | } |
3145 | } while(did_work); | 3145 | } while (did_work); |
3146 | 3146 | ||
3147 | list_for_each_entry(res, &ioa_cfg->used_res_q, queue) { | 3147 | list_for_each_entry(res, &ioa_cfg->used_res_q, queue) { |
3148 | if (res->add_to_ml) { | 3148 | if (res->add_to_ml) { |
@@ -3268,7 +3268,7 @@ static ssize_t ipr_show_log_level(struct device *dev, | |||
3268 | * number of bytes printed to buffer | 3268 | * number of bytes printed to buffer |
3269 | **/ | 3269 | **/ |
3270 | static ssize_t ipr_store_log_level(struct device *dev, | 3270 | static ssize_t ipr_store_log_level(struct device *dev, |
3271 | struct device_attribute *attr, | 3271 | struct device_attribute *attr, |
3272 | const char *buf, size_t count) | 3272 | const char *buf, size_t count) |
3273 | { | 3273 | { |
3274 | struct Scsi_Host *shost = class_to_shost(dev); | 3274 | struct Scsi_Host *shost = class_to_shost(dev); |
@@ -3315,7 +3315,7 @@ static ssize_t ipr_store_diagnostics(struct device *dev, | |||
3315 | return -EACCES; | 3315 | return -EACCES; |
3316 | 3316 | ||
3317 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); | 3317 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); |
3318 | while(ioa_cfg->in_reset_reload) { | 3318 | while (ioa_cfg->in_reset_reload) { |
3319 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); | 3319 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); |
3320 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); | 3320 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); |
3321 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); | 3321 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); |
@@ -3682,7 +3682,7 @@ static int ipr_update_ioa_ucode(struct ipr_ioa_cfg *ioa_cfg, | |||
3682 | unsigned long lock_flags; | 3682 | unsigned long lock_flags; |
3683 | 3683 | ||
3684 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); | 3684 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); |
3685 | while(ioa_cfg->in_reset_reload) { | 3685 | while (ioa_cfg->in_reset_reload) { |
3686 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); | 3686 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); |
3687 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); | 3687 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); |
3688 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); | 3688 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); |
@@ -3746,7 +3746,7 @@ static ssize_t ipr_store_update_fw(struct device *dev, | |||
3746 | len = snprintf(fname, 99, "%s", buf); | 3746 | len = snprintf(fname, 99, "%s", buf); |
3747 | fname[len-1] = '\0'; | 3747 | fname[len-1] = '\0'; |
3748 | 3748 | ||
3749 | if(request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) { | 3749 | if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) { |
3750 | dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname); | 3750 | dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname); |
3751 | return -EIO; | 3751 | return -EIO; |
3752 | } | 3752 | } |
@@ -4612,7 +4612,7 @@ static int ipr_slave_alloc(struct scsi_device *sdev) | |||
4612 | * Return value: | 4612 | * Return value: |
4613 | * SUCCESS / FAILED | 4613 | * SUCCESS / FAILED |
4614 | **/ | 4614 | **/ |
4615 | static int __ipr_eh_host_reset(struct scsi_cmnd * scsi_cmd) | 4615 | static int __ipr_eh_host_reset(struct scsi_cmnd *scsi_cmd) |
4616 | { | 4616 | { |
4617 | struct ipr_ioa_cfg *ioa_cfg; | 4617 | struct ipr_ioa_cfg *ioa_cfg; |
4618 | int rc; | 4618 | int rc; |
@@ -4634,7 +4634,7 @@ static int __ipr_eh_host_reset(struct scsi_cmnd * scsi_cmd) | |||
4634 | return rc; | 4634 | return rc; |
4635 | } | 4635 | } |
4636 | 4636 | ||
4637 | static int ipr_eh_host_reset(struct scsi_cmnd * cmd) | 4637 | static int ipr_eh_host_reset(struct scsi_cmnd *cmd) |
4638 | { | 4638 | { |
4639 | int rc; | 4639 | int rc; |
4640 | 4640 | ||
@@ -4701,7 +4701,7 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg, | |||
4701 | } | 4701 | } |
4702 | 4702 | ||
4703 | LEAVE; | 4703 | LEAVE; |
4704 | return (IPR_IOASC_SENSE_KEY(ioasc) ? -EIO : 0); | 4704 | return IPR_IOASC_SENSE_KEY(ioasc) ? -EIO : 0; |
4705 | } | 4705 | } |
4706 | 4706 | ||
4707 | /** | 4707 | /** |
@@ -4725,7 +4725,7 @@ static int ipr_sata_reset(struct ata_link *link, unsigned int *classes, | |||
4725 | 4725 | ||
4726 | ENTER; | 4726 | ENTER; |
4727 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); | 4727 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); |
4728 | while(ioa_cfg->in_reset_reload) { | 4728 | while (ioa_cfg->in_reset_reload) { |
4729 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); | 4729 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); |
4730 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); | 4730 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); |
4731 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); | 4731 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); |
@@ -4753,7 +4753,7 @@ static int ipr_sata_reset(struct ata_link *link, unsigned int *classes, | |||
4753 | * Return value: | 4753 | * Return value: |
4754 | * SUCCESS / FAILED | 4754 | * SUCCESS / FAILED |
4755 | **/ | 4755 | **/ |
4756 | static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd) | 4756 | static int __ipr_eh_dev_reset(struct scsi_cmnd *scsi_cmd) |
4757 | { | 4757 | { |
4758 | struct ipr_cmnd *ipr_cmd; | 4758 | struct ipr_cmnd *ipr_cmd; |
4759 | struct ipr_ioa_cfg *ioa_cfg; | 4759 | struct ipr_ioa_cfg *ioa_cfg; |
@@ -4811,10 +4811,10 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd) | |||
4811 | res->resetting_device = 0; | 4811 | res->resetting_device = 0; |
4812 | 4812 | ||
4813 | LEAVE; | 4813 | LEAVE; |
4814 | return (rc ? FAILED : SUCCESS); | 4814 | return rc ? FAILED : SUCCESS; |
4815 | } | 4815 | } |
4816 | 4816 | ||
4817 | static int ipr_eh_dev_reset(struct scsi_cmnd * cmd) | 4817 | static int ipr_eh_dev_reset(struct scsi_cmnd *cmd) |
4818 | { | 4818 | { |
4819 | int rc; | 4819 | int rc; |
4820 | 4820 | ||
@@ -4910,7 +4910,7 @@ static void ipr_abort_timeout(struct ipr_cmnd *ipr_cmd) | |||
4910 | * Return value: | 4910 | * Return value: |
4911 | * SUCCESS / FAILED | 4911 | * SUCCESS / FAILED |
4912 | **/ | 4912 | **/ |
4913 | static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd) | 4913 | static int ipr_cancel_op(struct scsi_cmnd *scsi_cmd) |
4914 | { | 4914 | { |
4915 | struct ipr_cmnd *ipr_cmd; | 4915 | struct ipr_cmnd *ipr_cmd; |
4916 | struct ipr_ioa_cfg *ioa_cfg; | 4916 | struct ipr_ioa_cfg *ioa_cfg; |
@@ -4979,7 +4979,7 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd) | |||
4979 | res->needs_sync_complete = 1; | 4979 | res->needs_sync_complete = 1; |
4980 | 4980 | ||
4981 | LEAVE; | 4981 | LEAVE; |
4982 | return (IPR_IOASC_SENSE_KEY(ioasc) ? FAILED : SUCCESS); | 4982 | return IPR_IOASC_SENSE_KEY(ioasc) ? FAILED : SUCCESS; |
4983 | } | 4983 | } |
4984 | 4984 | ||
4985 | /** | 4985 | /** |
@@ -4989,7 +4989,7 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd) | |||
4989 | * Return value: | 4989 | * Return value: |
4990 | * SUCCESS / FAILED | 4990 | * SUCCESS / FAILED |
4991 | **/ | 4991 | **/ |
4992 | static int ipr_eh_abort(struct scsi_cmnd * scsi_cmd) | 4992 | static int ipr_eh_abort(struct scsi_cmnd *scsi_cmd) |
4993 | { | 4993 | { |
4994 | unsigned long flags; | 4994 | unsigned long flags; |
4995 | int rc; | 4995 | int rc; |
@@ -5907,7 +5907,7 @@ static int ipr_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) | |||
5907 | * Return value: | 5907 | * Return value: |
5908 | * pointer to buffer with description string | 5908 | * pointer to buffer with description string |
5909 | **/ | 5909 | **/ |
5910 | static const char * ipr_ioa_info(struct Scsi_Host *host) | 5910 | static const char *ipr_ioa_info(struct Scsi_Host *host) |
5911 | { | 5911 | { |
5912 | static char buffer[512]; | 5912 | static char buffer[512]; |
5913 | struct ipr_ioa_cfg *ioa_cfg; | 5913 | struct ipr_ioa_cfg *ioa_cfg; |
@@ -5965,7 +5965,7 @@ static void ipr_ata_phy_reset(struct ata_port *ap) | |||
5965 | 5965 | ||
5966 | ENTER; | 5966 | ENTER; |
5967 | spin_lock_irqsave(ioa_cfg->host->host_lock, flags); | 5967 | spin_lock_irqsave(ioa_cfg->host->host_lock, flags); |
5968 | while(ioa_cfg->in_reset_reload) { | 5968 | while (ioa_cfg->in_reset_reload) { |
5969 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags); | 5969 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags); |
5970 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); | 5970 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); |
5971 | spin_lock_irqsave(ioa_cfg->host->host_lock, flags); | 5971 | spin_lock_irqsave(ioa_cfg->host->host_lock, flags); |
@@ -6005,7 +6005,7 @@ static void ipr_ata_post_internal(struct ata_queued_cmd *qc) | |||
6005 | unsigned long flags; | 6005 | unsigned long flags; |
6006 | 6006 | ||
6007 | spin_lock_irqsave(ioa_cfg->host->host_lock, flags); | 6007 | spin_lock_irqsave(ioa_cfg->host->host_lock, flags); |
6008 | while(ioa_cfg->in_reset_reload) { | 6008 | while (ioa_cfg->in_reset_reload) { |
6009 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags); | 6009 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags); |
6010 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); | 6010 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); |
6011 | spin_lock_irqsave(ioa_cfg->host->host_lock, flags); | 6011 | spin_lock_irqsave(ioa_cfg->host->host_lock, flags); |
@@ -6330,7 +6330,7 @@ static int ipr_invalid_adapter(struct ipr_ioa_cfg *ioa_cfg) | |||
6330 | int i; | 6330 | int i; |
6331 | 6331 | ||
6332 | if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) { | 6332 | if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) { |
6333 | for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){ | 6333 | for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++) { |
6334 | if (__is_processor(ipr_blocked_processors[i])) | 6334 | if (__is_processor(ipr_blocked_processors[i])) |
6335 | return 1; | 6335 | return 1; |
6336 | } | 6336 | } |
@@ -6608,7 +6608,7 @@ static void ipr_scsi_bus_speed_limit(struct ipr_ioa_cfg *ioa_cfg) | |||
6608 | * none | 6608 | * none |
6609 | **/ | 6609 | **/ |
6610 | static void ipr_modify_ioafp_mode_page_28(struct ipr_ioa_cfg *ioa_cfg, | 6610 | static void ipr_modify_ioafp_mode_page_28(struct ipr_ioa_cfg *ioa_cfg, |
6611 | struct ipr_mode_pages *mode_pages) | 6611 | struct ipr_mode_pages *mode_pages) |
6612 | { | 6612 | { |
6613 | int i, entry_length; | 6613 | int i, entry_length; |
6614 | struct ipr_dev_bus_entry *bus; | 6614 | struct ipr_dev_bus_entry *bus; |
@@ -8022,7 +8022,7 @@ static void ipr_reset_ioa_job(struct ipr_cmnd *ipr_cmd) | |||
8022 | ipr_reinit_ipr_cmnd(ipr_cmd); | 8022 | ipr_reinit_ipr_cmnd(ipr_cmd); |
8023 | ipr_cmd->job_step_failed = ipr_reset_cmd_failed; | 8023 | ipr_cmd->job_step_failed = ipr_reset_cmd_failed; |
8024 | rc = ipr_cmd->job_step(ipr_cmd); | 8024 | rc = ipr_cmd->job_step(ipr_cmd); |
8025 | } while(rc == IPR_RC_JOB_CONTINUE); | 8025 | } while (rc == IPR_RC_JOB_CONTINUE); |
8026 | } | 8026 | } |
8027 | 8027 | ||
8028 | /** | 8028 | /** |
@@ -8283,7 +8283,7 @@ static void ipr_free_cmd_blks(struct ipr_ioa_cfg *ioa_cfg) | |||
8283 | } | 8283 | } |
8284 | 8284 | ||
8285 | if (ioa_cfg->ipr_cmd_pool) | 8285 | if (ioa_cfg->ipr_cmd_pool) |
8286 | pci_pool_destroy (ioa_cfg->ipr_cmd_pool); | 8286 | pci_pool_destroy(ioa_cfg->ipr_cmd_pool); |
8287 | 8287 | ||
8288 | kfree(ioa_cfg->ipr_cmnd_list); | 8288 | kfree(ioa_cfg->ipr_cmnd_list); |
8289 | kfree(ioa_cfg->ipr_cmnd_list_dma); | 8289 | kfree(ioa_cfg->ipr_cmnd_list_dma); |
@@ -8363,8 +8363,8 @@ static int __devinit ipr_alloc_cmd_blks(struct ipr_ioa_cfg *ioa_cfg) | |||
8363 | dma_addr_t dma_addr; | 8363 | dma_addr_t dma_addr; |
8364 | int i; | 8364 | int i; |
8365 | 8365 | ||
8366 | ioa_cfg->ipr_cmd_pool = pci_pool_create (IPR_NAME, ioa_cfg->pdev, | 8366 | ioa_cfg->ipr_cmd_pool = pci_pool_create(IPR_NAME, ioa_cfg->pdev, |
8367 | sizeof(struct ipr_cmnd), 512, 0); | 8367 | sizeof(struct ipr_cmnd), 512, 0); |
8368 | 8368 | ||
8369 | if (!ioa_cfg->ipr_cmd_pool) | 8369 | if (!ioa_cfg->ipr_cmd_pool) |
8370 | return -ENOMEM; | 8370 | return -ENOMEM; |
@@ -8378,7 +8378,7 @@ static int __devinit ipr_alloc_cmd_blks(struct ipr_ioa_cfg *ioa_cfg) | |||
8378 | } | 8378 | } |
8379 | 8379 | ||
8380 | for (i = 0; i < IPR_NUM_CMD_BLKS; i++) { | 8380 | for (i = 0; i < IPR_NUM_CMD_BLKS; i++) { |
8381 | ipr_cmd = pci_pool_alloc (ioa_cfg->ipr_cmd_pool, GFP_KERNEL, &dma_addr); | 8381 | ipr_cmd = pci_pool_alloc(ioa_cfg->ipr_cmd_pool, GFP_KERNEL, &dma_addr); |
8382 | 8382 | ||
8383 | if (!ipr_cmd) { | 8383 | if (!ipr_cmd) { |
8384 | ipr_free_cmd_blks(ioa_cfg); | 8384 | ipr_free_cmd_blks(ioa_cfg); |
@@ -8964,7 +8964,7 @@ static void ipr_scan_vsets(struct ipr_ioa_cfg *ioa_cfg) | |||
8964 | int target, lun; | 8964 | int target, lun; |
8965 | 8965 | ||
8966 | for (target = 0; target < IPR_MAX_NUM_TARGETS_PER_BUS; target++) | 8966 | for (target = 0; target < IPR_MAX_NUM_TARGETS_PER_BUS; target++) |
8967 | for (lun = 0; lun < IPR_MAX_NUM_VSET_LUNS_PER_TARGET; lun++ ) | 8967 | for (lun = 0; lun < IPR_MAX_NUM_VSET_LUNS_PER_TARGET; lun++) |
8968 | scsi_add_device(ioa_cfg->host, IPR_VSET_BUS, target, lun); | 8968 | scsi_add_device(ioa_cfg->host, IPR_VSET_BUS, target, lun); |
8969 | } | 8969 | } |
8970 | 8970 | ||
@@ -9010,7 +9010,7 @@ static void __ipr_remove(struct pci_dev *pdev) | |||
9010 | ENTER; | 9010 | ENTER; |
9011 | 9011 | ||
9012 | spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags); | 9012 | spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags); |
9013 | while(ioa_cfg->in_reset_reload) { | 9013 | while (ioa_cfg->in_reset_reload) { |
9014 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags); | 9014 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags); |
9015 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); | 9015 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); |
9016 | spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags); | 9016 | spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags); |
@@ -9139,7 +9139,7 @@ static void ipr_shutdown(struct pci_dev *pdev) | |||
9139 | unsigned long lock_flags = 0; | 9139 | unsigned long lock_flags = 0; |
9140 | 9140 | ||
9141 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); | 9141 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); |
9142 | while(ioa_cfg->in_reset_reload) { | 9142 | while (ioa_cfg->in_reset_reload) { |
9143 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); | 9143 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); |
9144 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); | 9144 | wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); |
9145 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); | 9145 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); |