Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 138c014d authored by Horst Hummel's avatar Horst Hummel Committed by Martin Schwidefsky
Browse files

[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: default avatarHorst Hummel <horst.hummel@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 63b12246

drivers/s390/block/dasd.c

+18 −36
Original line number Diff line number Diff line
@@ -2172,21 +2172,3 @@ EXPORT_SYMBOL_GPL(dasd_generic_set_online); 
EXPORT_SYMBOL_GPL(dasd_generic_set_offline);

EXPORT_SYMBOL_GPL(dasd_generic_auto_online);

/*

 * 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_3370_erp.c

+4 −23
Original line number Diff line number Diff line
@@ -82,22 +82,3 @@ dasd_3370_erp_examine(struct dasd_ccw_req * cqr, struct irb * irb) 
	return 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
Original line number Diff line number Diff line
@@ -2723,22 +2723,3 @@ dasd_3990_erp_action(struct dasd_ccw_req * cqr) 
	return erp;



}				/* end dasd_3990_erp_action */
 


/*

 * 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_9336_erp.c

+4 −23
Original line number Diff line number Diff line
@@ -39,22 +39,3 @@ dasd_9336_erp_examine(struct dasd_ccw_req * cqr, struct irb * irb) 
	return 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_devmap.c

+12 −10
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ dasd_add_busid(char *bus_id, int features) 
	int 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 device_attribute *attr, char *buf) 
}



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;
@@ -673,7 +674,8 @@ dasd_use_diag_show(struct device *dev, struct device_attribute *attr, char *buf) 
}



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, struct device_attribute *attr, const cha 
	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;