diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/hpsa.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 6fe5142adc5e..9017e640e799 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c | |||
@@ -898,7 +898,7 @@ static int hpsa_slave_alloc(struct scsi_device *sdev) | |||
898 | 898 | ||
899 | static void hpsa_slave_destroy(struct scsi_device *sdev) | 899 | static void hpsa_slave_destroy(struct scsi_device *sdev) |
900 | { | 900 | { |
901 | return; /* nothing to do. */ | 901 | /* nothing to do. */ |
902 | } | 902 | } |
903 | 903 | ||
904 | static void hpsa_scsi_setup(struct ctlr_info *h) | 904 | static void hpsa_scsi_setup(struct ctlr_info *h) |
@@ -906,7 +906,6 @@ static void hpsa_scsi_setup(struct ctlr_info *h) | |||
906 | h->ndevices = 0; | 906 | h->ndevices = 0; |
907 | h->scsi_host = NULL; | 907 | h->scsi_host = NULL; |
908 | spin_lock_init(&h->devlock); | 908 | spin_lock_init(&h->devlock); |
909 | return; | ||
910 | } | 909 | } |
911 | 910 | ||
912 | static void complete_scsi_command(struct CommandList *cp, | 911 | static void complete_scsi_command(struct CommandList *cp, |
@@ -1775,7 +1774,6 @@ out: | |||
1775 | kfree(inq_buff); | 1774 | kfree(inq_buff); |
1776 | kfree(physdev_list); | 1775 | kfree(physdev_list); |
1777 | kfree(logdev_list); | 1776 | kfree(logdev_list); |
1778 | return; | ||
1779 | } | 1777 | } |
1780 | 1778 | ||
1781 | /* hpsa_scatter_gather takes a struct scsi_cmnd, (cmd), and does the pci | 1779 | /* hpsa_scatter_gather takes a struct scsi_cmnd, (cmd), and does the pci |
@@ -3106,7 +3104,6 @@ default_int_mode: | |||
3106 | #endif /* CONFIG_PCI_MSI */ | 3104 | #endif /* CONFIG_PCI_MSI */ |
3107 | /* if we get here we're going to use the default interrupt mode */ | 3105 | /* if we get here we're going to use the default interrupt mode */ |
3108 | h->intr[SIMPLE_MODE_INT] = pdev->irq; | 3106 | h->intr[SIMPLE_MODE_INT] = pdev->irq; |
3109 | return; | ||
3110 | } | 3107 | } |
3111 | 3108 | ||
3112 | static int hpsa_pci_init(struct ctlr_info *h, struct pci_dev *pdev) | 3109 | static int hpsa_pci_init(struct ctlr_info *h, struct pci_dev *pdev) |