s390: dasd whitespace and other cosmetics.
Subsystems (2)
PATCH 15/24 s390: dasd whitespace and other cosmetics.
From: Horst Hummel <[email protected]>
[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 <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
drivers/s390/block/dasd.c | 54 +++------- drivers/s390/block/dasd_3370_erp.c | 27 ----- drivers/s390/block/dasd_3990_erp.c | 189 ++++++++++++++++--------------------- drivers/s390/block/dasd_9336_erp.c | 27 ----- drivers/s390/block/dasd_9343_erp.c | 2 drivers/s390/block/dasd_devmap.c | 22 ++-- drivers/s390/block/dasd_diag.c | 6 - drivers/s390/block/dasd_diag.h | 2 drivers/s390/block/dasd_eckd.c | 52 +++------- drivers/s390/block/dasd_eckd.h | 8 - drivers/s390/block/dasd_erp.c | 8 - drivers/s390/block/dasd_fba.c | 29 ----- drivers/s390/block/dasd_fba.h | 2 drivers/s390/block/dasd_int.h | 37 +------ drivers/s390/block/dasd_ioctl.c | 12 +- 15 files changed, 173 insertions(+), 304 deletions(-)
drivers/s390/block/dasd_3370_erp.c +4 -23
@@ -1,4 +1,4 @@ -/* +/* * File...........: linux/drivers/s390/block/dasd_3370_erp.c * Author(s)......: Holger Smolinski <[email protected]> * Bugreports.to..: <[email protected]>
@@ -12,10 +12,10 @@/* -* DASD_3370_ERP_EXAMINE +* DASD_3370_ERP_EXAMINE * * DESCRIPTION -* Checks only for fatal/no/recover error. +* Checks only for fatal/no/recover error. * A detailed examination of the sense data is done later outside * the interrupt handler. *
@@ -23,7 +23,7 @@* 'Chapter 7. 3370 Sense Data'. * * RETURN VALUES -* dasd_era_none no error +* dasd_era_none no error * dasd_era_fatal for all fatal (unrecoverable errors) * dasd_era_recover for all others. */
@@ -82,22 +82,3 @@ dasd_3370_erp_examine(struct dasd_ccw_rereturn dasd_era_recover; }/* END dasd_3370_erp_examine */ - -/* -* Overrides for Emacs so that we follow Linus's tabbing style. -* Emacs will notice this stuff at the end of the file and automatically -* adjust the settings for this buffer only. This must remain at the end -* of the file. -* --------------------------------------------------------------------------- -* Local variables: -* c-indent-level: 4 -* c-brace-imaginary-offset: 0 -* c-brace-offset: -4 -* c-argdecl-indent: 4 -* c-label-offset: -4 -* c-continued-statement-offset: 4 -* c-continued-brace-offset: 0 -* indent-tabs-mode: 1 -* tab-width: 8 -* End: -*/
drivers/s390/block/dasd_3990_erp.c +85 -104
545 lines not on this page · raw message
drivers/s390/block/dasd_9336_erp.c +4 -23
@@ -1,4 +1,4 @@ -/* +/* * File...........: linux/drivers/s390/block/dasd_9336_erp.c * Author(s)......: Holger Smolinski <[email protected]> * Bugreports.to..: <[email protected]>
@@ -12,10 +12,10 @@/* -* DASD_9336_ERP_EXAMINE +* DASD_9336_ERP_EXAMINE * * DESCRIPTION -* Checks only for fatal/no/recover error. +* Checks only for fatal/no/recover error. * A detailed examination of the sense data is done later outside * the interrupt handler. *
@@ -23,7 +23,7 @@* 'Chapter 7. 9336 Sense Data'. * * RETURN VALUES -* dasd_era_none no error +* dasd_era_none no error * dasd_era_fatal for all fatal (unrecoverable errors) * dasd_era_recover for all others. */
@@ -39,22 +39,3 @@ dasd_9336_erp_examine(struct dasd_ccw_rereturn dasd_era_recover; }/* END dasd_9336_erp_examine */ - -/* -* Overrides for Emacs so that we follow Linus's tabbing style. -* Emacs will notice this stuff at the end of the file and automatically -* adjust the settings for this buffer only. This must remain at the end -* of the file. -* --------------------------------------------------------------------------- -* Local variables: -* c-indent-level: 4 -* c-brace-imaginary-offset: 0 -* c-brace-offset: -4 -* c-argdecl-indent: 4 -* c-label-offset: -4 -* c-continued-statement-offset: 4 -* c-continued-brace-offset: 0 -* indent-tabs-mode: 1 -* tab-width: 8 -* End: -*/
drivers/s390/block/dasd_9343_erp.c +1 -1
@@ -1,4 +1,4 @@ -/* +/* * File...........: linux/drivers/s390/block/dasd_9345_erp.c * Author(s)......: Holger Smolinski <[email protected]> * Bugreports.to..: <[email protected]>
drivers/s390/block/dasd.c +18 -36
145 lines not on this page · raw message
drivers/s390/block/dasd_devmap.c +12 -10
@@ -123,7 +123,7 @@ static inline int dasd_busid(char **str, int *id0, int *id1, int *devno) {int val, old_style; - +/* check for leading '0x' */ old_style =0 ;if ((*str)[0 ] =='0' && (*str)[1 ] =='x' ) {
@@ -179,7 +179,7 @@ dasd_feature_list(char *str, char **endp features =0 ;while (1 ) { -for (len =0 ; +for (len =0 ; str[len] && str[len] !=':' && str[len] !=')' ; len++);if (len ==2 && !strncmp (str,"ro" ,2 )) features |=DASD_FEATURE_READONLY ;
@@ -359,7 +359,7 @@ dasd_parse(void)* Add a devmap for the device specified by busid. It is possible that * the devmap already exists (dasd= parameter). The order of the devices * added through this function will define the kdevs for the individual -* devices. +* devices. */ static struct dasd_devmap *dasd_add_busid (char *bus_id,int features)
@@ -368,7 +368,7 @@ dasd_add_busid(char *bus_id, int featureint hash; new = (struct dasd_devmap *) -kmalloc (sizeof (struct dasd_devmap ),GFP_KERNEL ); +kzalloc (sizeof (struct dasd_devmap ),GFP_KERNEL );if (!new)return ERR_PTR (-ENOMEM );spin_lock (&dasd_devmap_lock);
@@ -630,7 +630,8 @@ dasd_ro_show(struct device *dev, struct }static ssize_t -dasd_ro_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) +dasd_ro_store (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) {struct dasd_devmap *devmap;int ro_flag;
@@ -658,7 +659,7 @@ static DEVICE_ATTR(readonly, 0644, dasd_* use_diag controls whether the driver should use diag rather than ssch * to talk to the device */ -static ssize_t +static ssize_t dasd_use_diag_show (struct device *dev,struct device_attribute *attr,char *buf) {struct dasd_devmap *devmap;
@@ -673,7 +674,8 @@ dasd_use_diag_show(struct device *dev, s }static ssize_t -dasd_use_diag_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) +dasd_use_diag_store (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) {struct dasd_devmap *devmap;ssize_t rc;
@@ -697,11 +699,11 @@ dasd_use_diag_store(struct device *dev,return rc; } -static -DEVICE_ATTR(use_diag, 0644, dasd_use_diag_show, dasd_use_diag_store); +static DEVICE_ATTR(use_diag, 0644, dasd_use_diag_show, dasd_use_diag_store);static ssize_t -dasd_discipline_show (struct device *dev,struct device_attribute *attr,char *buf) +dasd_discipline_show (struct device *dev,struct device_attribute *attr, +char *buf) {struct dasd_devmap *devmap;char *dname;
drivers/s390/block/dasd_diag.c +3 -3
@@ -1,4 +1,4 @@ -/* +/* * File...........: linux/drivers/s390/block/dasd_diag.c * Author(s)......: Holger Smolinski <[email protected]> * Based on.......: linux/drivers/s390/block/mdisk.c
@@ -336,7 +336,7 @@ dasd_diag_check_device(struct dasd_devic private = (struct dasd_diag_private *) device->private;if (private ==NULL ) { - private =kmalloc (sizeof (struct dasd_diag_private ),GFP_KERNEL ); + private =kzalloc (sizeof (struct dasd_diag_private ),GFP_KERNEL );if (private ==NULL ) {DEV_MESSAGE (KERN_WARNING , device,"%s" ,"memory allocation failed for private data" );
@@ -527,7 +527,7 @@ dasd_diag_build_cp(struct dasd_device * datasize, device);if (IS_ERR (cqr))return cqr; - + dreq = (struct dasd_diag_req *) cqr->data; dreq->block_count = count; dbio = dreq->bio;
drivers/s390/block/dasd_diag.h +1 -1
@@ -1,4 +1,4 @@ -/* +/* * File...........: linux/drivers/s390/block/dasd_diag.h * Author(s)......: Holger Smolinski <[email protected]> * Based on.......: linux/drivers/s390/block/mdisk.h
drivers/s390/block/dasd_eckd.c +16 -36
124 lines not on this page · raw message
drivers/s390/block/dasd_eckd.h +4 -4
@@ -1,7 +1,7 @@ -/* +/* * File...........: linux/drivers/s390/block/dasd_eckd.h * Author(s)......: Holger Smolinski <[email protected]> -* Horst Hummel <[email protected]> +* Horst Hummel <[email protected]> * Bugreports.to..: <[email protected]> * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 *
@@ -155,7 +155,7 @@ struct dasd_eckd_characteristics { unsigned char reserved2:4; unsigned char reserved3:8; unsigned char defect_wr:1; - unsigned char XRC_supported:1; + unsigned char XRC_supported:1; unsigned char reserved4:1; unsigned char striping:1; unsigned char reserved5:4;
@@ -343,7 +343,7 @@ struct dasd_eckd_path { };/* -* Perform Subsystem Function - Prepare for Read Subsystem Data +* Perform Subsystem Function - Prepare for Read Subsystem Data */ struct dasd_psf_prssd_data {unsigned char order;
drivers/s390/block/dasd_erp.c +4 -4
@@ -90,7 +90,7 @@ dasd_default_erp_action(struct dasd_ccw_/* just retry - there is nothing to save ... I got no sense data.... */ if (cqr->retries >0 ) { -DEV_MESSAGE (KERN_DEBUG , device, +DEV_MESSAGE (KERN_DEBUG , device,"default ERP called (%i retries left)" , cqr->retries); cqr->lpm =LPM_ANYPATH ;
@@ -155,7 +155,7 @@ dasd_default_erp_postaction(struct dasd_/* * Print the hex dump of the memory used by a request. This includes -* all error recovery ccws that have been chained in from of the +* all error recovery ccws that have been chained in from of the * real request. */ static inline void
@@ -227,12 +227,12 @@ dasd_log_ccw(struct dasd_ccw_req * cqr,/* * Log bytes arround failed CCW but only if we did * not log the whole CP of the CCW is outside the -* logged CP. +* logged CP. */ if (cplength >40 || ((addr_t ) cpa < (addr_t ) lcqr->cpaddr && (addr_t ) cpa > (addr_t) (lcqr->cpaddr + cplength +4 ))) { - +DEV_MESSAGE (KERN_ERR , device,"Failed CCW (%p) (area):" , (void *) (long ) cpa);
drivers/s390/block/dasd_fba.c +5 -24
@@ -1,4 +1,4 @@ -/* +/* * File...........: linux/drivers/s390/block/dasd_fba.c * Author(s)......: Holger Smolinski <[email protected]> * Bugreports.to..: <[email protected]>
@@ -125,13 +125,13 @@ static int dasd_fba_check_characteristics(struct dasd_device *device) {struct dasd_fba_private *private; -struct ccw_device *cdev = device->cdev; +struct ccw_device *cdev = device->cdev;void *rdc_data;int rc; private = (struct dasd_fba_private *) device->private;if (private ==NULL ) { - private =kmalloc (sizeof (struct dasd_fba_private ),GFP_KERNEL ); + private =kzalloc (sizeof (struct dasd_fba_private ),GFP_KERNEL );if (private ==NULL ) {DEV_MESSAGE (KERN_WARNING , device,"%s" , "memory allocation failed for private "
@@ -204,7 +204,7 @@ dasd_fba_examine_error(struct dasd_ccw_rif (irb->scsw.cstat ==0x00 && irb->scsw.dstat == (DEV_STAT_CHN_END |DEV_STAT_DEV_END ))return dasd_era_none; - + cdev = device->cdev;switch (cdev->id.dev_type) {case 0x3370 :
@@ -539,7 +539,7 @@ dasd_fba_dump_sense(struct dasd_device ** 8192 bytes (=2 pages). For 64 bit one dasd_mchunkt_t structure has * 24 bytes, the struct dasd_ccw_req has 136 bytes and each block can use * up to 16 bytes (8 for the ccw and 8 for the idal pointer). In -* addition we have one define extent ccw + 16 bytes of data and a +* addition we have one define extent ccw + 16 bytes of data and a * locate record ccw for each block (stupid devices!) + 16 bytes of data. * That makes: * (8192 - 24 - 136 - 8 - 16) / 40 = 200.2 blocks at maximum.
@@ -589,22 +589,3 @@ dasd_fba_cleanup(void)module_init (dasd_fba_init);module_exit (dasd_fba_cleanup); - -/* -* Overrides for Emacs so that we follow Linus's tabbing style. -* Emacs will notice this stuff at the end of the file and automatically -* adjust the settings for this buffer only. This must remain at the end -* of the file. -* --------------------------------------------------------------------------- -* Local variables: -* c-indent-level: 4 -* c-brace-imaginary-offset: 0 -* c-brace-offset: -4 -* c-argdecl-indent: 4 -* c-label-offset: -4 -* c-continued-statement-offset: 4 -* c-continued-brace-offset: 0 -* indent-tabs-mode: 1 -* tab-width: 8 -* End: -*/
drivers/s390/block/dasd_fba.h +1 -1
@@ -1,4 +1,4 @@ -/* +/* * File...........: linux/drivers/s390/block/dasd_fba.h * Author(s)......: Holger Smolinski <[email protected]> * Bugreports.to..: <[email protected]>
drivers/s390/block/dasd_int.h +9 -28
@@ -1,7 +1,7 @@ -/* +/* * File...........: linux/drivers/s390/block/dasd_int.h * Author(s)......: Holger Smolinski <[email protected]> -* Horst Hummel <[email protected]> +* Horst Hummel <[email protected]> * Martin Schwidefsky <[email protected]> * Bugreports.to..: <[email protected]> * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
@@ -186,7 +186,7 @@ struct dasd_ccw_req {void *callback_data; }; -/* +/* * dasd_ccw_req -> status can be: */ #define DASD_CQR_FILLED 0x00/* request is ready to be processed */
@@ -248,7 +248,7 @@ struct dasd_discipline {/* * Error recovery functions. examine_error() returns a value that * indicates what to do for an error condition. If examine_error() -* returns 'dasd_era_recover' erp_action() is called to create a +* returns 'dasd_era_recover' erp_action() is called to create a * special error recovery ccw. erp_postaction() is called after * an error recovery ccw has finished its execution. dump_sense * is called for every error condition to print the sense data
@@ -302,11 +302,11 @@ struct dasd_device {spinlock_t request_queue_lock;struct block_device *bdev;unsigned int devindex; -unsigned long blocks;/* size of volume in blocks */ -unsigned int bp_block;/* bytes per block */ -unsigned int s2b_shift;/* log2 (bp_block/512) */ -unsigned long flags;/* per device flags */ -unsigned short features;/* copy of devmap-features (read-only!) */ +unsigned long blocks;/* size of volume in blocks */ +unsigned int bp_block;/* bytes per block */ +unsigned int s2b_shift;/* log2 (bp_block/512) */ +unsigned long flags;/* per device flags */ +unsigned short features;/* copy of devmap-features (read-only!) */ /* extended error reporting stuff (eer) */ struct dasd_ccw_req *eer_cqr;
@@ -606,22 +606,3 @@ static inline int dasd_eer_enabled(struc#endif /* __KERNEL__ */ #endif /* DASD_H */ - -/* -* Overrides for Emacs so that we follow Linus's tabbing style. -* Emacs will notice this stuff at the end of the file and automatically -* adjust the settings for this buffer only. This must remain at the end -* of the file. -* --------------------------------------------------------------------------- -* Local variables: -* c-indent-level: 4 -* c-brace-imaginary-offset: 0 -* c-brace-offset: -4 -* c-argdecl-indent: 4 -* c-label-offset: -4 -* c-continued-statement-offset: 4 -* c-continued-brace-offset: 0 -* indent-tabs-mode: 1 -* tab-width: 8 -* End: -*/
drivers/s390/block/dasd_ioctl.c +6 -6
@@ -90,10 +90,10 @@ static int dasd_ioctl_quiesce(struct dasd_device *device) {unsigned long flags; - +if (!capable (CAP_SYS_ADMIN ))return -EACCES ; - +DEV_MESSAGE (KERN_DEBUG , device,"%s" ,"Quiesce IO on device" );spin_lock_irqsave (get_ccwdev_lock (device->cdev), flags);
@@ -110,13 +110,13 @@ static int dasd_ioctl_resume(struct dasd_device *device) {unsigned long flags; - -if (!capable (CAP_SYS_ADMIN )) + +if (!capable (CAP_SYS_ADMIN ))return -EACCES ;DEV_MESSAGE (KERN_DEBUG , device,"%s" ,"resume IO on device" ); - +spin_lock_irqsave (get_ccwdev_lock (device->cdev), flags); device->stopped &= ~DASD_STOPPED_QUIESCE ;spin_unlock_irqrestore (get_ccwdev_lock (device->cdev), flags);
@@ -287,7 +287,7 @@ dasd_ioctl_information(struct dasd_devic dasd_info->open_count =atomic_read (&device->open_count);if (!device->bdev) dasd_info->open_count++; - +/* * check if device is really formatted * LDL / CDL was returned by 'fill_info'