diff options
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/DAC960.c | 8 | ||||
-rw-r--r-- | drivers/block/swim3.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 8b50af381a8e..c77b6f3c28ea 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c | |||
@@ -6653,7 +6653,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request, | |||
6653 | else ErrorCode = get_user(ControllerNumber, | 6653 | else ErrorCode = get_user(ControllerNumber, |
6654 | &UserSpaceControllerInfo->ControllerNumber); | 6654 | &UserSpaceControllerInfo->ControllerNumber); |
6655 | if (ErrorCode != 0) | 6655 | if (ErrorCode != 0) |
6656 | break;; | 6656 | break; |
6657 | ErrorCode = -ENXIO; | 6657 | ErrorCode = -ENXIO; |
6658 | if (ControllerNumber < 0 || | 6658 | if (ControllerNumber < 0 || |
6659 | ControllerNumber > DAC960_ControllerCount - 1) { | 6659 | ControllerNumber > DAC960_ControllerCount - 1) { |
@@ -6661,7 +6661,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request, | |||
6661 | } | 6661 | } |
6662 | Controller = DAC960_Controllers[ControllerNumber]; | 6662 | Controller = DAC960_Controllers[ControllerNumber]; |
6663 | if (Controller == NULL) | 6663 | if (Controller == NULL) |
6664 | break;; | 6664 | break; |
6665 | memset(&ControllerInfo, 0, sizeof(DAC960_ControllerInfo_T)); | 6665 | memset(&ControllerInfo, 0, sizeof(DAC960_ControllerInfo_T)); |
6666 | ControllerInfo.ControllerNumber = ControllerNumber; | 6666 | ControllerInfo.ControllerNumber = ControllerNumber; |
6667 | ControllerInfo.FirmwareType = Controller->FirmwareType; | 6667 | ControllerInfo.FirmwareType = Controller->FirmwareType; |
@@ -7210,7 +7210,7 @@ static struct pci_driver DAC960_pci_driver = { | |||
7210 | .remove = DAC960_Remove, | 7210 | .remove = DAC960_Remove, |
7211 | }; | 7211 | }; |
7212 | 7212 | ||
7213 | static int DAC960_init_module(void) | 7213 | static int __init DAC960_init_module(void) |
7214 | { | 7214 | { |
7215 | int ret; | 7215 | int ret; |
7216 | 7216 | ||
@@ -7222,7 +7222,7 @@ static int DAC960_init_module(void) | |||
7222 | return ret; | 7222 | return ret; |
7223 | } | 7223 | } |
7224 | 7224 | ||
7225 | static void DAC960_cleanup_module(void) | 7225 | static void __exit DAC960_cleanup_module(void) |
7226 | { | 7226 | { |
7227 | int i; | 7227 | int i; |
7228 | 7228 | ||
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index e39e3820fef9..6380ad8d91bd 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c | |||
@@ -1062,7 +1062,7 @@ static int swim3_add_device(struct macio_dev *mdev, int index) | |||
1062 | goto out_release; | 1062 | goto out_release; |
1063 | } | 1063 | } |
1064 | fs->swim3_intr = macio_irq(mdev, 0); | 1064 | fs->swim3_intr = macio_irq(mdev, 0); |
1065 | fs->dma_intr = macio_irq(mdev, 1);; | 1065 | fs->dma_intr = macio_irq(mdev, 1); |
1066 | fs->cur_cyl = -1; | 1066 | fs->cur_cyl = -1; |
1067 | fs->cur_sector = -1; | 1067 | fs->cur_sector = -1; |
1068 | fs->secpercyl = 36; | 1068 | fs->secpercyl = 36; |