diff options
author | Karen Xie <kxie@chelsio.com> | 2009-04-01 14:11:27 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-04-03 10:23:13 -0400 |
commit | 0d0c27f2e83619083280c4c4f1bc33f2b58132ac (patch) | |
tree | 62fc26f09335c64549c8b7eea5c14e469d8eae28 /drivers/scsi/cxgb3i/cxgb3i_init.c | |
parent | 2a90030fcb827afa16914e57ac587e683280ae4a (diff) |
[SCSI] cxgb3i: merge cxgb3i_ddp into cxgb3i module
- Merge cxgb3i_ddp.ko to cxgb3i.ko as there is no other users.
- Bump the driver version up to 1.0.2.
Signed-off-by: Karen Xie <kxie@chelsio.com>
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/cxgb3i/cxgb3i_init.c')
-rw-r--r-- | drivers/scsi/cxgb3i/cxgb3i_init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/cxgb3i/cxgb3i_init.c b/drivers/scsi/cxgb3i/cxgb3i_init.c index 833dbfa3f88a..042d9bce9914 100644 --- a/drivers/scsi/cxgb3i/cxgb3i_init.c +++ b/drivers/scsi/cxgb3i/cxgb3i_init.c | |||
@@ -12,8 +12,8 @@ | |||
12 | #include "cxgb3i.h" | 12 | #include "cxgb3i.h" |
13 | 13 | ||
14 | #define DRV_MODULE_NAME "cxgb3i" | 14 | #define DRV_MODULE_NAME "cxgb3i" |
15 | #define DRV_MODULE_VERSION "1.0.1" | 15 | #define DRV_MODULE_VERSION "1.0.2" |
16 | #define DRV_MODULE_RELDATE "Jan. 2009" | 16 | #define DRV_MODULE_RELDATE "Mar. 2009" |
17 | 17 | ||
18 | static char version[] = | 18 | static char version[] = |
19 | "Chelsio S3xx iSCSI Driver " DRV_MODULE_NAME | 19 | "Chelsio S3xx iSCSI Driver " DRV_MODULE_NAME |
@@ -50,6 +50,7 @@ static void open_s3_dev(struct t3cdev *t3dev) | |||
50 | vers_printed = 1; | 50 | vers_printed = 1; |
51 | } | 51 | } |
52 | 52 | ||
53 | cxgb3i_ddp_init(t3dev); | ||
53 | cxgb3i_sdev_add(t3dev, &t3c_client); | 54 | cxgb3i_sdev_add(t3dev, &t3c_client); |
54 | cxgb3i_adapter_open(t3dev); | 55 | cxgb3i_adapter_open(t3dev); |
55 | } | 56 | } |
@@ -62,6 +63,7 @@ static void close_s3_dev(struct t3cdev *t3dev) | |||
62 | { | 63 | { |
63 | cxgb3i_adapter_close(t3dev); | 64 | cxgb3i_adapter_close(t3dev); |
64 | cxgb3i_sdev_remove(t3dev); | 65 | cxgb3i_sdev_remove(t3dev); |
66 | cxgb3i_ddp_cleanup(t3dev); | ||
65 | } | 67 | } |
66 | 68 | ||
67 | static void s3_err_handler(struct t3cdev *tdev, u32 status, u32 error) | 69 | static void s3_err_handler(struct t3cdev *tdev, u32 status, u32 error) |