Commit baebc70a authored by Joe Perches's avatar Joe Perches Committed by Martin Schwidefsky
Browse files

s390: Use pr_warn instead of pr_warning 



Convert the uses of pr_warning to pr_warn so there are fewer
uses of the old pr_warning.

Miscellanea:

o Align arguments
o Coalesce formats

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 543691a4

arch/s390/kernel/cpcmd.c

+1 −2
Original line number Diff line number Diff line
@@ -96,8 +96,7 @@ int cpcmd(const char *cmd, char *response, int rlen, int *response_code) 
			(((unsigned long)response + rlen) >> 31)) {

		lowbuf = kmalloc(rlen, GFP_KERNEL | GFP_DMA);

		if (!lowbuf) {

			pr_warning("The cpcmd kernel function failed to "

				   "allocate a response buffer\n");

			pr_warn("The cpcmd kernel function failed to allocate a response buffer\n");

			return -ENOMEM;

		}

		spin_lock_irqsave(&cpcmd_lock, flags);

arch/s390/kernel/debug.c

+2 −4
Original line number Diff line number Diff line
@@ -699,8 +699,7 @@ debug_info_t *debug_register_mode(const char *name, int pages_per_area, 
	/* Since debugfs currently does not support uid/gid other than root, */

	/* we do not allow gid/uid != 0 until we get support for that. */

	if ((uid != 0) || (gid != 0))

		pr_warning("Root becomes the owner of all s390dbf files "

			   "in sysfs\n");

		pr_warn("Root becomes the owner of all s390dbf files in sysfs\n");

	BUG_ON(!initialized);

	mutex_lock(&debug_mutex);
@@ -1307,8 +1306,7 @@ debug_input_level_fn(debug_info_t * id, struct debug_view *view, 
		new_level = debug_get_uint(str);

	}

	if(new_level < 0) {

		pr_warning("%s is not a valid level for a debug "

			   "feature\n", str);

		pr_warn("%s is not a valid level for a debug feature\n", str);

		rc = -EINVAL;

	} else {

		debug_set_level(id, new_level);

arch/s390/kernel/time.c

+2 −4
Original line number Diff line number Diff line
@@ -499,8 +499,7 @@ static void etr_reset(void) 
		if (etr_port0_online && etr_port1_online)

			set_bit(CLOCK_SYNC_ETR, &clock_sync_flags);

	} else if (etr_port0_online || etr_port1_online) {

		pr_warning("The real or virtual hardware system does "

			   "not provide an ETR interface\n");

		pr_warn("The real or virtual hardware system does not provide an ETR interface\n");

		etr_port0_online = etr_port1_online = 0;

	}

}
@@ -1464,8 +1463,7 @@ static void __init stp_reset(void) 
	if (rc == 0)

		set_bit(CLOCK_SYNC_HAS_STP, &clock_sync_flags);

	else if (stp_online) {

		pr_warning("The real or virtual hardware system does "

			   "not provide an STP interface\n");

		pr_warn("The real or virtual hardware system does not provide an STP interface\n");

		free_page((unsigned long) stp_page);

		stp_page = NULL;

		stp_online = 0;

arch/s390/mm/extmem.c

+7 −9
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ query_segment_type (struct dcss_segment *seg) 
		goto out_free;

	}

	if (diag_cc > 1) {

		pr_warning("Querying a DCSS type failed with rc=%ld\n", vmrc);

		pr_warn("Querying a DCSS type failed with rc=%ld\n", vmrc);

		rc = dcss_diag_translate_rc (vmrc);

		goto out_free;

	}
@@ -457,8 +457,7 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long 
		goto out_resource;

	}

	if (diag_cc > 1) {

		pr_warning("Loading DCSS %s failed with rc=%ld\n", name,

			   end_addr);

		pr_warn("Loading DCSS %s failed with rc=%ld\n", name, end_addr);

		rc = dcss_diag_translate_rc(end_addr);

		dcss_diag(&purgeseg_scode, seg->dcss_name,

				&dummy, &dummy);
@@ -574,8 +573,7 @@ segment_modify_shared (char *name, int do_nonshared) 
		goto out_unlock;

	}

	if (atomic_read (&seg->ref_count) != 1) {

		pr_warning("DCSS %s is in use and cannot be reloaded\n",

			   name);

		pr_warn("DCSS %s is in use and cannot be reloaded\n", name);

		rc = -EAGAIN;

		goto out_unlock;

	}
@@ -588,8 +586,8 @@ segment_modify_shared (char *name, int do_nonshared) 
			seg->res->flags |= IORESOURCE_READONLY;



	if (request_resource(&iomem_resource, seg->res)) {

		pr_warning("DCSS %s overlaps with used memory resources "

			   "and cannot be reloaded\n", name);

		pr_warn("DCSS %s overlaps with used memory resources and cannot be reloaded\n",

			name);

		rc = -EBUSY;

		kfree(seg->res);

		goto out_del_mem;
@@ -607,8 +605,8 @@ segment_modify_shared (char *name, int do_nonshared) 
		goto out_del_res;

	}

	if (diag_cc > 1) {

		pr_warning("Reloading DCSS %s failed with rc=%ld\n", name,

			   end_addr);

		pr_warn("Reloading DCSS %s failed with rc=%ld\n",

			name, end_addr);

		rc = dcss_diag_translate_rc(end_addr);

		goto out_del_res;

	}

drivers/s390/block/dasd_devmap.c

+4 −6
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ dasd_feature_list(char *str, char **endp) 
		else if (len == 8 && !strncmp(str, "failfast", 8))

			features |= DASD_FEATURE_FAILFAST;

		else {

			pr_warning("%*s is not a supported device option\n",

			pr_warn("%*s is not a supported device option\n",

				len, str);

			rc = -EINVAL;

		}
@@ -224,8 +224,7 @@ dasd_feature_list(char *str, char **endp) 
		str++;

	}

	if (*str != ')') {

		pr_warning("A closing parenthesis ')' is missing in the "

			   "dasd= parameter\n");

		pr_warn("A closing parenthesis ')' is missing in the dasd= parameter\n");

		rc = -EINVAL;

	} else

		str++;
@@ -348,8 +347,7 @@ dasd_parse_range( char *parsestring ) { 
		return str + 1;

	if (*str == '\0')

		return str;

	pr_warning("The dasd= parameter value %s has an invalid ending\n",

		   str);

	pr_warn("The dasd= parameter value %s has an invalid ending\n", str);

	return ERR_PTR(-EINVAL);

}