diff options
author | Horst Hummel <horst.hummel@de.ibm.com> | 2006-06-29 08:58:12 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-06-29 08:58:12 -0400 |
commit | 138c014dcba74211dc4e835658f34a787c40cf17 (patch) | |
tree | bef8f3f5b4f088d5826553d5876c6d751e23bf33 /drivers/s390/block/dasd_fba.c | |
parent | 63b122466484e44d09af12bba33b34019757a3c2 (diff) |
[S390] dasd whitespace and other cosmetics.
Dasd code cleanup: 1) remove white space, 2) remove the emacs override
sections, and 3) use kzalloc instead of kmalloc.
Signed-off-by: Horst Hummel <horst.hummel@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/block/dasd_fba.c')
-rw-r--r-- | drivers/s390/block/dasd_fba.c | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c index 91145698f8e9..d331c6e22c59 100644 --- a/drivers/s390/block/dasd_fba.c +++ b/drivers/s390/block/dasd_fba.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * File...........: linux/drivers/s390/block/dasd_fba.c | 2 | * File...........: linux/drivers/s390/block/dasd_fba.c |
3 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> | 3 | * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com> |
4 | * Bugreports.to..: <Linux390@de.ibm.com> | 4 | * Bugreports.to..: <Linux390@de.ibm.com> |
@@ -125,13 +125,13 @@ static int | |||
125 | dasd_fba_check_characteristics(struct dasd_device *device) | 125 | dasd_fba_check_characteristics(struct dasd_device *device) |
126 | { | 126 | { |
127 | struct dasd_fba_private *private; | 127 | struct dasd_fba_private *private; |
128 | struct ccw_device *cdev = device->cdev; | 128 | struct ccw_device *cdev = device->cdev; |
129 | void *rdc_data; | 129 | void *rdc_data; |
130 | int rc; | 130 | int rc; |
131 | 131 | ||
132 | private = (struct dasd_fba_private *) device->private; | 132 | private = (struct dasd_fba_private *) device->private; |
133 | if (private == NULL) { | 133 | if (private == NULL) { |
134 | private = kmalloc(sizeof(struct dasd_fba_private), GFP_KERNEL); | 134 | private = kzalloc(sizeof(struct dasd_fba_private), GFP_KERNEL); |
135 | if (private == NULL) { | 135 | if (private == NULL) { |
136 | DEV_MESSAGE(KERN_WARNING, device, "%s", | 136 | DEV_MESSAGE(KERN_WARNING, device, "%s", |
137 | "memory allocation failed for private " | 137 | "memory allocation failed for private " |
@@ -204,7 +204,7 @@ dasd_fba_examine_error(struct dasd_ccw_req * cqr, struct irb * irb) | |||
204 | if (irb->scsw.cstat == 0x00 && | 204 | if (irb->scsw.cstat == 0x00 && |
205 | irb->scsw.dstat == (DEV_STAT_CHN_END | DEV_STAT_DEV_END)) | 205 | irb->scsw.dstat == (DEV_STAT_CHN_END | DEV_STAT_DEV_END)) |
206 | return dasd_era_none; | 206 | return dasd_era_none; |
207 | 207 | ||
208 | cdev = device->cdev; | 208 | cdev = device->cdev; |
209 | switch (cdev->id.dev_type) { | 209 | switch (cdev->id.dev_type) { |
210 | case 0x3370: | 210 | case 0x3370: |
@@ -539,7 +539,7 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req, | |||
539 | * 8192 bytes (=2 pages). For 64 bit one dasd_mchunkt_t structure has | 539 | * 8192 bytes (=2 pages). For 64 bit one dasd_mchunkt_t structure has |
540 | * 24 bytes, the struct dasd_ccw_req has 136 bytes and each block can use | 540 | * 24 bytes, the struct dasd_ccw_req has 136 bytes and each block can use |
541 | * up to 16 bytes (8 for the ccw and 8 for the idal pointer). In | 541 | * up to 16 bytes (8 for the ccw and 8 for the idal pointer). In |
542 | * addition we have one define extent ccw + 16 bytes of data and a | 542 | * addition we have one define extent ccw + 16 bytes of data and a |
543 | * locate record ccw for each block (stupid devices!) + 16 bytes of data. | 543 | * locate record ccw for each block (stupid devices!) + 16 bytes of data. |
544 | * That makes: | 544 | * That makes: |
545 | * (8192 - 24 - 136 - 8 - 16) / 40 = 200.2 blocks at maximum. | 545 | * (8192 - 24 - 136 - 8 - 16) / 40 = 200.2 blocks at maximum. |
@@ -589,22 +589,3 @@ dasd_fba_cleanup(void) | |||
589 | 589 | ||
590 | module_init(dasd_fba_init); | 590 | module_init(dasd_fba_init); |
591 | module_exit(dasd_fba_cleanup); | 591 | module_exit(dasd_fba_cleanup); |
592 | |||
593 | /* | ||
594 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
595 | * Emacs will notice this stuff at the end of the file and automatically | ||
596 | * adjust the settings for this buffer only. This must remain at the end | ||
597 | * of the file. | ||
598 | * --------------------------------------------------------------------------- | ||
599 | * Local variables: | ||
600 | * c-indent-level: 4 | ||
601 | * c-brace-imaginary-offset: 0 | ||
602 | * c-brace-offset: -4 | ||
603 | * c-argdecl-indent: 4 | ||
604 | * c-label-offset: -4 | ||
605 | * c-continued-statement-offset: 4 | ||
606 | * c-continued-brace-offset: 0 | ||
607 | * indent-tabs-mode: 1 | ||
608 | * tab-width: 8 | ||
609 | * End: | ||
610 | */ | ||