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

Commit b3ff088b authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

[S390] convert sclp printks to pr_xxx macros. 



Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 8f7c502c

drivers/s390/char/sclp_cmd.c

+16 −13
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
 *		 Peter Oberparleiter <peter.oberparleiter@de.ibm.com>

 */



#define KMSG_COMPONENT "sclp_cmd"

#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt



#include <linux/completion.h>

#include <linux/init.h>

#include <linux/errno.h>
@@ -16,9 +19,8 @@ 
#include <linux/memory.h>

#include <asm/chpid.h>

#include <asm/sclp.h>

#include "sclp.h"



#define TAG	"sclp_cmd: "

#include "sclp.h"



#define SCLP_CMDW_READ_SCP_INFO		0x00020001

#define SCLP_CMDW_READ_SCP_INFO_FORCED	0x00120001
@@ -169,8 +171,8 @@ static int do_sync_request(sclp_cmdw_t cmd, void *sccb) 


	/* Check response. */

	if (request->status != SCLP_REQ_DONE) {

		printk(KERN_WARNING TAG "sync request failed "

		       "(cmd=0x%08x, status=0x%02x)\n", cmd, request->status);

		pr_warning("sync request failed (cmd=0x%08x, "

			   "status=0x%02x)\n", cmd, request->status);

		rc = -EIO;

	}

out:
@@ -224,8 +226,8 @@ int sclp_get_cpu_info(struct sclp_cpu_info *info) 
	if (rc)

		goto out;

	if (sccb->header.response_code != 0x0010) {

		printk(KERN_WARNING TAG "readcpuinfo failed "

		       "(response=0x%04x)\n", sccb->header.response_code);

		pr_warning("readcpuinfo failed (response=0x%04x)\n",

			   sccb->header.response_code);

		rc = -EIO;

		goto out;

	}
@@ -262,8 +264,9 @@ static int do_cpu_configure(sclp_cmdw_t cmd) 
	case 0x0120:

		break;

	default:

		printk(KERN_WARNING TAG "configure cpu failed (cmd=0x%08x, "

		       "response=0x%04x)\n", cmd, sccb->header.response_code);

		pr_warning("configure cpu failed (cmd=0x%08x, "

			   "response=0x%04x)\n", cmd,

			   sccb->header.response_code);

		rc = -EIO;

		break;

	}
@@ -626,7 +629,7 @@ static int do_chp_configure(sclp_cmdw_t cmd) 
	case 0x0450:

		break;

	default:

		printk(KERN_WARNING TAG "configure channel-path failed "

		pr_warning("configure channel-path failed "

			   "(cmd=0x%08x, response=0x%04x)\n", cmd,

			   sccb->header.response_code);

		rc = -EIO;
@@ -695,7 +698,7 @@ int sclp_chp_read_info(struct sclp_chp_info *info) 
	if (rc)

		goto out;

	if (sccb->header.response_code != 0x0010) {

		printk(KERN_WARNING TAG "read channel-path info failed "

		pr_warning("read channel-path info failed "

			   "(response=0x%04x)\n", sccb->header.response_code);

		rc = -EIO;

		goto out;

drivers/s390/char/sclp_config.c

+6 −4
Original line number Diff line number Diff line
@@ -5,15 +5,17 @@ 
 *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>

 */



#define KMSG_COMPONENT "sclp_config"

#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt



#include <linux/init.h>

#include <linux/errno.h>

#include <linux/cpu.h>

#include <linux/sysdev.h>

#include <linux/workqueue.h>

#include <asm/smp.h>

#include "sclp.h"



#define TAG	"sclp_config: "

#include "sclp.h"



struct conf_mgm_data {

	u8 reserved;
@@ -31,7 +33,7 @@ static void sclp_cpu_capability_notify(struct work_struct *work) 
	int cpu;

	struct sys_device *sysdev;



	printk(KERN_WARNING TAG "cpu capability changed.\n");

	pr_warning("cpu capability changed.\n");

	get_online_cpus();

	for_each_online_cpu(cpu) {

		sysdev = get_cpu_sysdev(cpu);
@@ -78,7 +80,7 @@ static int __init sclp_conf_init(void) 
		return rc;



	if (!(sclp_conf_register.sclp_send_mask & EVTYP_CONFMGMDATA_MASK)) {

		printk(KERN_WARNING TAG "no configuration management.\n");

		pr_warning("no configuration management.\n");

		sclp_unregister(&sclp_conf_register);

		rc = -ENOSYS;

	}

drivers/s390/char/sclp_cpi_sys.c

+8 −4
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ 
 *		 Michael Ernst <mernst@de.ibm.com>

 */



#define KMSG_COMPONENT "sclp_cpi"

#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/stat.h>
@@ -20,6 +23,7 @@ 
#include <linux/completion.h>

#include <asm/ebcdic.h>

#include <asm/sclp.h>



#include "sclp.h"

#include "sclp_rw.h"

#include "sclp_cpi_sys.h"
@@ -150,7 +154,7 @@ static int cpi_req(void) 
	wait_for_completion(&completion);



	if (req->status != SCLP_REQ_DONE) {

		printk(KERN_WARNING "cpi: request failed (status=0x%02x)\n",

		pr_warning("request failed (status=0x%02x)\n",

			   req->status);

		rc = -EIO;

		goto out_free_req;
@@ -158,8 +162,8 @@ static int cpi_req(void) 


	response = ((struct cpi_sccb *) req->sccb)->header.response_code;

	if (response != 0x0020) {

		printk(KERN_WARNING "cpi: failed with "

			"response code 0x%x\n", response);

		pr_warning("request failed with response code 0x%x\n",

			   response);

		rc = -EIO;

	}

drivers/s390/char/sclp_sdias.c

+11 −7
Original line number Diff line number Diff line
@@ -5,15 +5,18 @@ 
 * Author(s): Michael Holzheu

 */



#define KMSG_COMPONENT "sclp_sdias"

#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt



#include <linux/sched.h>

#include <asm/sclp.h>

#include <asm/debug.h>

#include <asm/ipl.h>



#include "sclp.h"

#include "sclp_rw.h"



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

#define ERROR_MSG(x...) printk ( KERN_ALERT "SDIAS: " x )



#define SDIAS_RETRIES 300

#define SDIAS_SLEEP_TICKS 50
@@ -131,7 +134,7 @@ int sclp_sdias_blk_count(void) 


	rc = sdias_sclp_send(&request);

	if (rc) {

		ERROR_MSG("sclp_send failed for get_nr_blocks\n");

		pr_err("sclp_send failed for get_nr_blocks\n");

		goto out;

	}

	if (sccb.hdr.response_code != 0x0020) {
@@ -145,7 +148,8 @@ int sclp_sdias_blk_count(void) 
			rc = sccb.evbuf.blk_cnt;

			break;

		default:

			ERROR_MSG("SCLP error: %x\n", sccb.evbuf.event_status);

			pr_err("SCLP error: %x\n",

			       sccb.evbuf.event_status);

			rc = -EIO;

			goto out;

	}
@@ -201,7 +205,7 @@ int sclp_sdias_copy(void *dest, int start_blk, int nr_blks) 


	rc = sdias_sclp_send(&request);

	if (rc) {

		ERROR_MSG("sclp_send failed: %x\n", rc);

		pr_err("sclp_send failed: %x\n", rc);

		goto out;

	}

	if (sccb.hdr.response_code != 0x0020) {
@@ -219,7 +223,7 @@ int sclp_sdias_copy(void *dest, int start_blk, int nr_blks) 
		case EVSTATE_NO_DATA:

			TRACE("no data\n");

		default:

			ERROR_MSG("Error from SCLP while copying hsa. "

			pr_err("Error from SCLP while copying hsa. "

			       "Event status = %x\n",

			       sccb.evbuf.event_status);

			rc = -EIO;