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

Commit 763968e2 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] Avoid sparse warnings. 



Monthly sparse warning avoidance patch. Sigh.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent aaff0f64

drivers/s390/block/dasd.c

+4 −3
Original line number Diff line number Diff line
@@ -2174,9 +2174,10 @@ dasd_generic_notify(struct ccw_device *cdev, int event) 
	return ret;

}



struct dasd_ccw_req * dasd_generic_build_rdc(struct dasd_device *device,

static struct dasd_ccw_req *dasd_generic_build_rdc(struct dasd_device *device,

						   void *rdc_buffer,

					     int rdc_buffer_size, char *magic)

						   int rdc_buffer_size,

						   char *magic)

{

	struct dasd_ccw_req *cqr;

	struct ccw1 *ccw;

drivers/s390/block/dasd_eckd.c

+3 −3
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ dasd_eckd_generate_uid(struct dasd_device *device, struct dasd_uid *uid) 
	return 0;

}



struct dasd_ccw_req * dasd_eckd_build_rcd_lpm(struct dasd_device *device,

static struct dasd_ccw_req *dasd_eckd_build_rcd_lpm(struct dasd_device *device,

						    void *rcd_buffer,

						    struct ciw *ciw, __u8 lpm)

{

drivers/s390/char/sclp.h

+3 −0
Original line number Diff line number Diff line
@@ -132,6 +132,9 @@ int sclp_deactivate(void); 
int sclp_reactivate(void);

int sclp_service_call(sclp_cmdw_t command, void *sccb);



int sclp_sdias_init(void);

void sclp_sdias_exit(void);



/* useful inlines */



/* VM uses EBCDIC 037, LPAR+native(SE+HMC) use EBCDIC 500 */

drivers/s390/char/sclp_sdias.c

+4 −4
Original line number Diff line number Diff line
@@ -66,9 +66,9 @@ static DEFINE_MUTEX(sdias_mutex); 


static void sdias_callback(struct sclp_req *request, void *data)

{

	struct sdias_sccb *sccb;

	struct sdias_sccb *cbsccb;



	sccb = (struct sdias_sccb *) request->sccb;

	cbsccb = (struct sdias_sccb *) request->sccb;

	sclp_req_done = 1;

	wake_up(&sdias_wq); /* Inform caller, that request is complete */

	TRACE("callback done\n");
@@ -229,7 +229,7 @@ int sclp_sdias_copy(void *dest, int start_blk, int nr_blks) 
	return rc;

}



int __init sdias_init(void)

int __init sclp_sdias_init(void)

{

	int rc;
@@ -248,7 +248,7 @@ int __init sdias_init(void) 
	return 0;

}



void __exit sdias_exit(void)

void __exit sclp_sdias_exit(void)

{

	debug_unregister(sdias_dbf);

	sclp_unregister(&sclp_sdias_register);

drivers/s390/char/zcore.c

+3 −6
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/debug.h>

#include <asm/processor.h>

#include <asm/irqflags.h>

#include "sclp.h"



#define TRACE(x...) debug_sprintf_event(zcore_dbf, 1, x)

#define MSG(x...) printk( KERN_ALERT x )
@@ -564,8 +565,6 @@ static void __init zcore_header_init(int arch, struct zcore_header *hdr) 
	get_cpu_id(&hdr->cpu_id);

}



extern int sdias_init(void);



static int __init zcore_init(void)

{

	unsigned char arch;
@@ -582,7 +581,7 @@ static int __init zcore_init(void) 
	TRACE("wwpn:   %llx\n", (unsigned long long) ipl_info.data.fcp.wwpn);

	TRACE("lun:    %llx\n", (unsigned long long) ipl_info.data.fcp.lun);



	rc = sdias_init();

	rc = sclp_sdias_init();

	if (rc)

		goto fail;
@@ -634,12 +633,10 @@ static int __init zcore_init(void) 
	return rc;

}



extern void sdias_exit(void);



static void __exit zcore_exit(void)

{

	debug_unregister(zcore_dbf);

	sdias_exit();

	sclp_sdias_exit();

	diag308(DIAG308_REL_HSA, NULL);

}