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

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
...@@ -96,8 +96,7 @@ int cpcmd(const char *cmd, char *response, int rlen, int *response_code) ...@@ -96,8 +96,7 @@ int cpcmd(const char *cmd, char *response, int rlen, int *response_code)
(((unsigned long)response + rlen) >> 31)) { (((unsigned long)response + rlen) >> 31)) {
lowbuf = kmalloc(rlen, GFP_KERNEL | GFP_DMA); lowbuf = kmalloc(rlen, GFP_KERNEL | GFP_DMA);
if (!lowbuf) { if (!lowbuf) {
pr_warning("The cpcmd kernel function failed to " pr_warn("The cpcmd kernel function failed to allocate a response buffer\n");
"allocate a response buffer\n");
return -ENOMEM; return -ENOMEM;
} }
spin_lock_irqsave(&cpcmd_lock, flags); spin_lock_irqsave(&cpcmd_lock, flags);
......
...@@ -699,8 +699,7 @@ debug_info_t *debug_register_mode(const char *name, int pages_per_area, ...@@ -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, */ /* Since debugfs currently does not support uid/gid other than root, */
/* we do not allow gid/uid != 0 until we get support for that. */ /* we do not allow gid/uid != 0 until we get support for that. */
if ((uid != 0) || (gid != 0)) if ((uid != 0) || (gid != 0))
pr_warning("Root becomes the owner of all s390dbf files " pr_warn("Root becomes the owner of all s390dbf files in sysfs\n");
"in sysfs\n");
BUG_ON(!initialized); BUG_ON(!initialized);
mutex_lock(&debug_mutex); mutex_lock(&debug_mutex);
...@@ -1307,8 +1306,7 @@ debug_input_level_fn(debug_info_t * id, struct debug_view *view, ...@@ -1307,8 +1306,7 @@ debug_input_level_fn(debug_info_t * id, struct debug_view *view,
new_level = debug_get_uint(str); new_level = debug_get_uint(str);
} }
if(new_level < 0) { if(new_level < 0) {
pr_warning("%s is not a valid level for a debug " pr_warn("%s is not a valid level for a debug feature\n", str);
"feature\n", str);
rc = -EINVAL; rc = -EINVAL;
} else { } else {
debug_set_level(id, new_level); debug_set_level(id, new_level);
......
...@@ -499,8 +499,7 @@ static void etr_reset(void) ...@@ -499,8 +499,7 @@ static void etr_reset(void)
if (etr_port0_online && etr_port1_online) if (etr_port0_online && etr_port1_online)
set_bit(CLOCK_SYNC_ETR, &clock_sync_flags); set_bit(CLOCK_SYNC_ETR, &clock_sync_flags);
} else if (etr_port0_online || etr_port1_online) { } else if (etr_port0_online || etr_port1_online) {
pr_warning("The real or virtual hardware system does " pr_warn("The real or virtual hardware system does not provide an ETR interface\n");
"not provide an ETR interface\n");
etr_port0_online = etr_port1_online = 0; etr_port0_online = etr_port1_online = 0;
} }
} }
...@@ -1464,8 +1463,7 @@ static void __init stp_reset(void) ...@@ -1464,8 +1463,7 @@ static void __init stp_reset(void)
if (rc == 0) if (rc == 0)
set_bit(CLOCK_SYNC_HAS_STP, &clock_sync_flags); set_bit(CLOCK_SYNC_HAS_STP, &clock_sync_flags);
else if (stp_online) { else if (stp_online) {
pr_warning("The real or virtual hardware system does " pr_warn("The real or virtual hardware system does not provide an STP interface\n");
"not provide an STP interface\n");
free_page((unsigned long) stp_page); free_page((unsigned long) stp_page);
stp_page = NULL; stp_page = NULL;
stp_online = 0; stp_online = 0;
......
...@@ -265,7 +265,7 @@ query_segment_type (struct dcss_segment *seg) ...@@ -265,7 +265,7 @@ query_segment_type (struct dcss_segment *seg)
goto out_free; goto out_free;
} }
if (diag_cc > 1) { 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); rc = dcss_diag_translate_rc (vmrc);
goto out_free; goto out_free;
} }
...@@ -457,8 +457,7 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long ...@@ -457,8 +457,7 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long
goto out_resource; goto out_resource;
} }
if (diag_cc > 1) { if (diag_cc > 1) {
pr_warning("Loading DCSS %s failed with rc=%ld\n", name, pr_warn("Loading DCSS %s failed with rc=%ld\n", name, end_addr);
end_addr);
rc = dcss_diag_translate_rc(end_addr); rc = dcss_diag_translate_rc(end_addr);
dcss_diag(&purgeseg_scode, seg->dcss_name, dcss_diag(&purgeseg_scode, seg->dcss_name,
&dummy, &dummy); &dummy, &dummy);
...@@ -574,8 +573,7 @@ segment_modify_shared (char *name, int do_nonshared) ...@@ -574,8 +573,7 @@ segment_modify_shared (char *name, int do_nonshared)
goto out_unlock; goto out_unlock;
} }
if (atomic_read (&seg->ref_count) != 1) { if (atomic_read (&seg->ref_count) != 1) {
pr_warning("DCSS %s is in use and cannot be reloaded\n", pr_warn("DCSS %s is in use and cannot be reloaded\n", name);
name);
rc = -EAGAIN; rc = -EAGAIN;
goto out_unlock; goto out_unlock;
} }
...@@ -588,8 +586,8 @@ segment_modify_shared (char *name, int do_nonshared) ...@@ -588,8 +586,8 @@ segment_modify_shared (char *name, int do_nonshared)
seg->res->flags |= IORESOURCE_READONLY; seg->res->flags |= IORESOURCE_READONLY;
if (request_resource(&iomem_resource, seg->res)) { if (request_resource(&iomem_resource, seg->res)) {
pr_warning("DCSS %s overlaps with used memory resources " pr_warn("DCSS %s overlaps with used memory resources and cannot be reloaded\n",
"and cannot be reloaded\n", name); name);
rc = -EBUSY; rc = -EBUSY;
kfree(seg->res); kfree(seg->res);
goto out_del_mem; goto out_del_mem;
...@@ -607,8 +605,8 @@ segment_modify_shared (char *name, int do_nonshared) ...@@ -607,8 +605,8 @@ segment_modify_shared (char *name, int do_nonshared)
goto out_del_res; goto out_del_res;
} }
if (diag_cc > 1) { if (diag_cc > 1) {
pr_warning("Reloading DCSS %s failed with rc=%ld\n", name, pr_warn("Reloading DCSS %s failed with rc=%ld\n",
end_addr); name, end_addr);
rc = dcss_diag_translate_rc(end_addr); rc = dcss_diag_translate_rc(end_addr);
goto out_del_res; goto out_del_res;
} }
......
...@@ -214,7 +214,7 @@ dasd_feature_list(char *str, char **endp) ...@@ -214,7 +214,7 @@ dasd_feature_list(char *str, char **endp)
else if (len == 8 && !strncmp(str, "failfast", 8)) else if (len == 8 && !strncmp(str, "failfast", 8))
features |= DASD_FEATURE_FAILFAST; features |= DASD_FEATURE_FAILFAST;
else { else {
pr_warning("%*s is not a supported device option\n", pr_warn("%*s is not a supported device option\n",
len, str); len, str);
rc = -EINVAL; rc = -EINVAL;
} }
...@@ -224,8 +224,7 @@ dasd_feature_list(char *str, char **endp) ...@@ -224,8 +224,7 @@ dasd_feature_list(char *str, char **endp)
str++; str++;
} }
if (*str != ')') { if (*str != ')') {
pr_warning("A closing parenthesis ')' is missing in the " pr_warn("A closing parenthesis ')' is missing in the dasd= parameter\n");
"dasd= parameter\n");
rc = -EINVAL; rc = -EINVAL;
} else } else
str++; str++;
...@@ -348,8 +347,7 @@ dasd_parse_range( char *parsestring ) { ...@@ -348,8 +347,7 @@ dasd_parse_range( char *parsestring ) {
return str + 1; return str + 1;
if (*str == '\0') if (*str == '\0')
return str; return str;
pr_warning("The dasd= parameter value %s has an invalid ending\n", pr_warn("The dasd= parameter value %s has an invalid ending\n", str);
str);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
......
...@@ -144,14 +144,13 @@ dasd_diag_erp(struct dasd_device *device) ...@@ -144,14 +144,13 @@ dasd_diag_erp(struct dasd_device *device)
rc = mdsk_init_io(device, device->block->bp_block, 0, NULL); rc = mdsk_init_io(device, device->block->bp_block, 0, NULL);
if (rc == 4) { if (rc == 4) {
if (!(test_and_set_bit(DASD_FLAG_DEVICE_RO, &device->flags))) if (!(test_and_set_bit(DASD_FLAG_DEVICE_RO, &device->flags)))
pr_warning("%s: The access mode of a DIAG device " pr_warn("%s: The access mode of a DIAG device changed to read-only\n",
"changed to read-only\n",
dev_name(&device->cdev->dev)); dev_name(&device->cdev->dev));
rc = 0; rc = 0;
} }
if (rc) if (rc)
pr_warning("%s: DIAG ERP failed with " pr_warn("%s: DIAG ERP failed with rc=%d\n",
"rc=%d\n", dev_name(&device->cdev->dev), rc); dev_name(&device->cdev->dev), rc);
} }
/* Start a given request at the device. Return zero on success, non-zero /* Start a given request at the device. Return zero on success, non-zero
...@@ -367,8 +366,8 @@ dasd_diag_check_device(struct dasd_device *device) ...@@ -367,8 +366,8 @@ dasd_diag_check_device(struct dasd_device *device)
private->pt_block = 2; private->pt_block = 2;
break; break;
default: default:
pr_warning("%s: Device type %d is not supported " pr_warn("%s: Device type %d is not supported in DIAG mode\n",
"in DIAG mode\n", dev_name(&device->cdev->dev), dev_name(&device->cdev->dev),
private->rdc_data.vdev_class); private->rdc_data.vdev_class);
rc = -EOPNOTSUPP; rc = -EOPNOTSUPP;
goto out; goto out;
...@@ -410,7 +409,7 @@ dasd_diag_check_device(struct dasd_device *device) ...@@ -410,7 +409,7 @@ dasd_diag_check_device(struct dasd_device *device)
private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT; private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT;
rc = dia250(&private->iob, RW_BIO); rc = dia250(&private->iob, RW_BIO);
if (rc == 3) { if (rc == 3) {
pr_warning("%s: A 64-bit DIAG call failed\n", pr_warn("%s: A 64-bit DIAG call failed\n",
dev_name(&device->cdev->dev)); dev_name(&device->cdev->dev));
rc = -EOPNOTSUPP; rc = -EOPNOTSUPP;
goto out_label; goto out_label;
...@@ -420,8 +419,7 @@ dasd_diag_check_device(struct dasd_device *device) ...@@ -420,8 +419,7 @@ dasd_diag_check_device(struct dasd_device *device)
break; break;
} }
if (bsize > PAGE_SIZE) { if (bsize > PAGE_SIZE) {
pr_warning("%s: Accessing the DASD failed because of an " pr_warn("%s: Accessing the DASD failed because of an incorrect format (rc=%d)\n",
"incorrect format (rc=%d)\n",
dev_name(&device->cdev->dev), rc); dev_name(&device->cdev->dev), rc);
rc = -EIO; rc = -EIO;
goto out_label; goto out_label;
...@@ -440,7 +438,7 @@ dasd_diag_check_device(struct dasd_device *device) ...@@ -440,7 +438,7 @@ dasd_diag_check_device(struct dasd_device *device)
block->s2b_shift++; block->s2b_shift++;
rc = mdsk_init_io(device, block->bp_block, 0, NULL); rc = mdsk_init_io(device, block->bp_block, 0, NULL);
if (rc && (rc != 4)) { if (rc && (rc != 4)) {
pr_warning("%s: DIAG initialization failed with rc=%d\n", pr_warn("%s: DIAG initialization failed with rc=%d\n",
dev_name(&device->cdev->dev), rc); dev_name(&device->cdev->dev), rc);
rc = -EIO; rc = -EIO;
} else { } else {
......
...@@ -178,8 +178,8 @@ int dasd_gendisk_init(void) ...@@ -178,8 +178,8 @@ int dasd_gendisk_init(void)
/* Register to static dasd major 94 */ /* Register to static dasd major 94 */
rc = register_blkdev(DASD_MAJOR, "dasd"); rc = register_blkdev(DASD_MAJOR, "dasd");
if (rc != 0) { if (rc != 0) {
pr_warning("Registering the device driver with major number " pr_warn("Registering the device driver with major number %d failed\n",
"%d failed\n", DASD_MAJOR); DASD_MAJOR);
return rc; return rc;
} }
return 0; return 0;
......
...@@ -265,8 +265,7 @@ dasd_ioctl_format(struct block_device *bdev, void __user *argp) ...@@ -265,8 +265,7 @@ dasd_ioctl_format(struct block_device *bdev, void __user *argp)
return -EFAULT; return -EFAULT;
} }
if (bdev != bdev->bd_contains) { if (bdev != bdev->bd_contains) {
pr_warning("%s: The specified DASD is a partition and cannot " pr_warn("%s: The specified DASD is a partition and cannot be formatted\n",
"be formatted\n",
dev_name(&base->cdev->dev)); dev_name(&base->cdev->dev));
dasd_put_device(base); dasd_put_device(base);
return -EINVAL; return -EINVAL;
......
...@@ -322,13 +322,12 @@ static ssize_t dasd_stats_proc_write(struct file *file, ...@@ -322,13 +322,12 @@ static ssize_t dasd_stats_proc_write(struct file *file,
return user_len; return user_len;
out_parse_error: out_parse_error:
rc = -EINVAL; rc = -EINVAL;
pr_warning("%s is not a supported value for /proc/dasd/statistics\n", pr_warn("%s is not a supported value for /proc/dasd/statistics\n", str);
str);
out_error: out_error:
vfree(buffer); vfree(buffer);
return rc; return rc;
#else #else
pr_warning("/proc/dasd/statistics: is not activated in this kernel\n"); pr_warn("/proc/dasd/statistics: is not activated in this kernel\n");
return user_len; return user_len;
#endif /* CONFIG_DASD_PROFILE */ #endif /* CONFIG_DASD_PROFILE */
} }
......
...@@ -738,15 +738,15 @@ dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const ch ...@@ -738,15 +738,15 @@ dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const ch
dev_info = dcssblk_get_device_by_name(local_buf); dev_info = dcssblk_get_device_by_name(local_buf);
if (dev_info == NULL) { if (dev_info == NULL) {
up_write(&dcssblk_devices_sem); up_write(&dcssblk_devices_sem);
pr_warning("Device %s cannot be removed because it is not a " pr_warn("Device %s cannot be removed because it is not a known device\n",
"known device\n", local_buf); local_buf);
rc = -ENODEV; rc = -ENODEV;
goto out_buf; goto out_buf;
} }
if (atomic_read(&dev_info->use_count) != 0) { if (atomic_read(&dev_info->use_count) != 0) {
up_write(&dcssblk_devices_sem); up_write(&dcssblk_devices_sem);
pr_warning("Device %s cannot be removed while it is in " pr_warn("Device %s cannot be removed while it is in use\n",
"use\n", local_buf); local_buf);
rc = -EBUSY; rc = -EBUSY;
goto out_buf; goto out_buf;
} }
...@@ -850,8 +850,7 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio) ...@@ -850,8 +850,7 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)
case SEG_TYPE_SC: case SEG_TYPE_SC:
/* cannot write to these segments */ /* cannot write to these segments */
if (bio_data_dir(bio) == WRITE) { if (bio_data_dir(bio) == WRITE) {
pr_warning("Writing to %s failed because it " pr_warn("Writing to %s failed because it is a read-only device\n",
"is a read-only device\n",
dev_name(&dev_info->dev)); dev_name(&dev_info->dev));
goto fail; goto fail;
} }
......
...@@ -257,7 +257,7 @@ static void mon_iucv_message_pending(struct iucv_path *path, ...@@ -257,7 +257,7 @@ static void mon_iucv_message_pending(struct iucv_path *path,
memcpy(&monpriv->msg_array[monpriv->write_index]->msg, memcpy(&monpriv->msg_array[monpriv->write_index]->msg,
msg, sizeof(*msg)); msg, sizeof(*msg));
if (atomic_inc_return(&monpriv->msglim_count) == MON_MSGLIM) { if (atomic_inc_return(&monpriv->msglim_count) == MON_MSGLIM) {
pr_warning("The read queue for monitor data is full\n"); pr_warn("The read queue for monitor data is full\n");
monpriv->msg_array[monpriv->write_index]->msglim_reached = 1; monpriv->msg_array[monpriv->write_index]->msglim_reached = 1;
} }
monpriv->write_index = (monpriv->write_index + 1) % MON_MSGLIM; monpriv->write_index = (monpriv->write_index + 1) % MON_MSGLIM;
...@@ -342,8 +342,8 @@ static int mon_close(struct inode *inode, struct file *filp) ...@@ -342,8 +342,8 @@ static int mon_close(struct inode *inode, struct file *filp)
if (monpriv->path) { if (monpriv->path) {
rc = iucv_path_sever(monpriv->path, user_data_sever); rc = iucv_path_sever(monpriv->path, user_data_sever);
if (rc) if (rc)
pr_warning("Disconnecting the z/VM *MONITOR system " pr_warn("Disconnecting the z/VM *MONITOR system service failed with rc=%i\n",
"service failed with rc=%i\n", rc); rc);
iucv_path_free(monpriv->path); iucv_path_free(monpriv->path);
} }
...@@ -469,8 +469,8 @@ static int monreader_freeze(struct device *dev) ...@@ -469,8 +469,8 @@ static int monreader_freeze(struct device *dev)
if (monpriv->path) { if (monpriv->path) {
rc = iucv_path_sever(monpriv->path, user_data_sever); rc = iucv_path_sever(monpriv->path, user_data_sever);
if (rc) if (rc)
pr_warning("Disconnecting the z/VM *MONITOR system " pr_warn("Disconnecting the z/VM *MONITOR system service failed with rc=%i\n",
"service failed with rc=%i\n", rc); rc);
iucv_path_free(monpriv->path); iucv_path_free(monpriv->path);
} }
atomic_set(&monpriv->iucv_severed, 0); atomic_set(&monpriv->iucv_severed, 0);
......
...@@ -67,8 +67,8 @@ int sclp_sync_request_timeout(sclp_cmdw_t cmd, void *sccb, int timeout) ...@@ -67,8 +67,8 @@ int sclp_sync_request_timeout(sclp_cmdw_t cmd, void *sccb, int timeout)
/* Check response. */ /* Check response. */
if (request->status != SCLP_REQ_DONE) { if (request->status != SCLP_REQ_DONE) {
pr_warning("sync request failed (cmd=0x%08x, " pr_warn("sync request failed (cmd=0x%08x, status=0x%02x)\n",
"status=0x%02x)\n", cmd, request->status); cmd, request->status);
rc = -EIO; rc = -EIO;
} }
out: out:
...@@ -122,7 +122,7 @@ int sclp_get_core_info(struct sclp_core_info *info) ...@@ -122,7 +122,7 @@ int sclp_get_core_info(struct sclp_core_info *info)
if (rc) if (rc)
goto out; goto out;
if (sccb->header.response_code != 0x0010) { if (sccb->header.response_code != 0x0010) {
pr_warning("readcpuinfo failed (response=0x%04x)\n", pr_warn("readcpuinfo failed (response=0x%04x)\n",
sccb->header.response_code); sccb->header.response_code);
rc = -EIO; rc = -EIO;
goto out; goto out;
...@@ -160,9 +160,8 @@ static int do_core_configure(sclp_cmdw_t cmd) ...@@ -160,9 +160,8 @@ static int do_core_configure(sclp_cmdw_t cmd)
case 0x0120: case 0x0120:
break; break;
default: default:
pr_warning("configure cpu failed (cmd=0x%08x, " pr_warn("configure cpu failed (cmd=0x%08x, response=0x%04x)\n",
"response=0x%04x)\n", cmd, cmd, sccb->header.response_code);
sccb->header.response_code);
rc = -EIO; rc = -EIO;
break; break;
} }
...@@ -230,9 +229,8 @@ static int do_assign_storage(sclp_cmdw_t cmd, u16 rn) ...@@ -230,9 +229,8 @@ static int do_assign_storage(sclp_cmdw_t cmd, u16 rn)
case 0x0120: case 0x0120:
break; break;
default: default:
pr_warning("assign storage failed (cmd=0x%08x, " pr_warn("assign storage failed (cmd=0x%08x, response=0x%04x, rn=0x%04x)\n",
"response=0x%04x, rn=0x%04x)\n", cmd, cmd, sccb->header.response_code, rn);
sccb->header.response_code, rn);
rc = -EIO; rc = -EIO;
break; break;
} }
...@@ -675,9 +673,8 @@ static int do_chp_configure(sclp_cmdw_t cmd) ...@@ -675,9 +673,8 @@ static int do_chp_configure(sclp_cmdw_t cmd)
case 0x0450: case 0x0450:
break; break;
default: default:
pr_warning("configure channel-path failed " pr_warn("configure channel-path failed (cmd=0x%08x, response=0x%04x)\n",
"(cmd=0x%08x, response=0x%04x)\n", cmd, cmd, sccb->header.response_code);
sccb->header.response_code);
rc = -EIO; rc = -EIO;
break; break;
} }
...@@ -744,8 +741,8 @@ int sclp_chp_read_info(struct sclp_chp_info *info) ...@@ -744,8 +741,8 @@ int sclp_chp_read_info(struct sclp_chp_info *info)
if (rc) if (rc)
goto out; goto out;
if (sccb->header.response_code != 0x0010) { if (sccb->header.response_code != 0x0010) {
pr_warning("read channel-path info failed " pr_warn("read channel-path info failed (response=0x%04x)\n",
"(response=0x%04x)\n", sccb->header.response_code); sccb->header.response_code);
rc = -EIO; rc = -EIO;
goto out; goto out;
} }
......
...@@ -154,16 +154,14 @@ static int cpi_req(void) ...@@ -154,16 +154,14 @@ static int cpi_req(void)
wait_for_completion(&completion); wait_for_completion(&completion);
if (req->status != SCLP_REQ_DONE) { if (req->status != SCLP_REQ_DONE) {
pr_warning("request failed (status=0x%02x)\n", pr_warn("request failed (status=0x%02x)\n", req->status);
req->status);
rc = -EIO; rc = -EIO;
goto out_free_req; goto out_free_req;
} }
response = ((struct cpi_sccb *) req->sccb)->header.response_code; response = ((struct cpi_sccb *) req->sccb)->header.response_code;
if (response != 0x0020) { if (response != 0x0020) {
pr_warning("request failed with response code 0x%x\n", pr_warn("request failed with response code 0x%x\n", response);
response);
rc = -EIO; rc = -EIO;
} }
......
...@@ -699,8 +699,8 @@ tape_generic_remove(struct ccw_device *cdev) ...@@ -699,8 +699,8 @@ tape_generic_remove(struct ccw_device *cdev)
*/ */
DBF_EVENT(3, "(%08x): Drive in use vanished!\n", DBF_EVENT(3, "(%08x): Drive in use vanished!\n",
device->cdev_id); device->cdev_id);
pr_warning("%s: A tape unit was detached while in " pr_warn("%s: A tape unit was detached while in use\n",
"use\n", dev_name(&device->cdev->dev)); dev_name(&device->cdev->dev));
tape_state_set(device, TS_NOT_OPER); tape_state_set(device, TS_NOT_OPER);
__tape_discard_requests(device); __tape_discard_requests(device);
spin_unlock_irq(get_ccwdev_lock(device->cdev)); spin_unlock_irq(get_ccwdev_lock(device->cdev));
......
...@@ -343,8 +343,7 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp) ...@@ -343,8 +343,7 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
if (logptr->autorecording) { if (logptr->autorecording) {
ret = vmlogrdr_recording(logptr,1,logptr->autopurge); ret = vmlogrdr_recording(logptr,1,logptr->autopurge);
if (ret) if (ret)
pr_warning("vmlogrdr: failed to start " pr_warn("vmlogrdr: failed to start recording automatically\n");
"recording automatically\n");
} }
/* create connection to the system service */ /* create connection to the system service */
...@@ -396,8 +395,7 @@ static int vmlogrdr_release (struct inode *inode, struct file *filp) ...@@ -396,8 +395,7 @@ static int vmlogrdr_release (struct inode *inode, struct file *filp)
if (logptr->autorecording) { if (logptr->autorecording) {
ret = vmlogrdr_recording(logptr,0,logptr->autopurge); ret = vmlogrdr_recording(logptr,0,logptr->autopurge);
if (ret) if (ret)
pr_warning("vmlogrdr: failed to stop " pr_warn("vmlogrdr: failed to stop recording automatically\n");
"recording automatically\n");
} }
logptr->dev_in_use = 0; logptr->dev_in_use = 0;
......
...@@ -51,9 +51,8 @@ static int blacklist_range(range_action action, unsigned int from_ssid, ...@@ -51,9 +51,8 @@ static int blacklist_range(range_action action, unsigned int from_ssid,
{ {
if ((from_ssid > to_ssid) || ((from_ssid == to_ssid) && (from > to))) { if ((from_ssid > to_ssid) || ((from_ssid == to_ssid) && (from > to))) {
if (msgtrigger) if (msgtrigger)
pr_warning("0.%x.%04x to 0.%x.%04x is not a valid " pr_warn("0.%x.%04x to 0.%x.%04x is not a valid range for cio_ignore\n",
"range for cio_ignore\n", from_ssid, from, from_ssid, from, to_ssid, to);
to_ssid, to);
return 1; return 1;
} }
...@@ -140,8 +139,8 @@ static int parse_busid(char *str, unsigned int *cssid, unsigned int *ssid, ...@@ -140,8 +139,8 @@ static int parse_busid(char *str, unsigned int *cssid, unsigned int *ssid,
rc = 0; rc = 0;
out: out:
if (rc && msgtrigger) if (rc && msgtrigger)
pr_warning("%s is not a valid device for the cio_ignore " pr_warn("%s is not a valid device for the cio_ignore kernel parameter\n",
"kernel parameter\n", str); str);
return rc; return rc;
} }
......
...@@ -333,8 +333,7 @@ void ccw_request_timeout(struct ccw_device *cdev) ...@@ -333,8 +333,7 @@ void ccw_request_timeout(struct ccw_device *cdev)
for (chp = 0; chp < 8; chp++) { for (chp = 0; chp < 8; chp++) {
if ((0x80 >> chp) & sch->schib.pmcw.lpum) if ((0x80 >> chp) & sch->schib.pmcw.lpum)
pr_warning("%s: No interrupt was received within %lus " pr_warn("%s: No interrupt was received within %lus (CS=%02x, DS=%02x, CHPID=%x.%02x)\n",
"(CS=%02x, DS=%02x, CHPID=%x.%02x)\n",
dev_name(&cdev->dev), req->timeout / HZ, dev_name(&cdev->dev), req->timeout / HZ,
scsw_cstat(&sch->schib.scsw), scsw_cstat(&sch->schib.scsw),
scsw_dstat(&sch->schib.scsw), scsw_dstat(&sch->schib.scsw),
......
...@@ -656,7 +656,7 @@ struct subchannel *cio_probe_console(void) ...@@ -656,7 +656,7 @@ struct subchannel *cio_probe_console(void)
sch_no = cio_get_console_sch_no(); sch_no = cio_get_console_sch_no();
if (sch_no == -1) { if (sch_no == -1) {
pr_warning("No CCW console was found\n"); pr_warn("No CCW console was found\n");
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
} }
init_subchannel_id(&schid); init_subchannel_id(&schid);
......
...@@ -364,11 +364,11 @@ int ccw_device_set_offline(struct ccw_device *cdev) ...@@ -364,11 +364,11 @@ int ccw_device_set_offline(struct ccw_device *cdev)
cdev->private->state == DEV_STATE_DISCONNECTED)); cdev->private->state == DEV_STATE_DISCONNECTED));
/* Inform the user if set offline failed. */ /* Inform the user if set offline failed. */
if (cdev->private->state == DEV_STATE_BOXED) { if (cdev->private->state == DEV_STATE_BOXED) {
pr_warning("%s: The device entered boxed state while " pr_warn("%s: The device entered boxed state while being set offline\n",
"being set offline\n", dev_name(&cdev->dev)); dev_name(&cdev->dev));
} else if (cdev->private->state == DEV_STATE_NOT_OPER) { } else if (cdev->private->state == DEV_STATE_NOT_OPER) {
pr_warning("%s: The device stopped operating while " pr_warn("%s: The device stopped operating while being set offline\n",
"being set offline\n", dev_name(&cdev->dev)); dev_name(&cdev->dev));
} }
/* Give up reference from ccw_device_set_online(). */ /* Give up reference from ccw_device_set_online(). */
put_device(&cdev->dev); put_device(&cdev->dev);
...@@ -429,12 +429,10 @@ int ccw_device_set_online(struct ccw_device *cdev) ...@@ -429,12 +429,10 @@ int ccw_device_set_online(struct ccw_device *cdev)
spin_unlock_irq(cdev->ccwlock); spin_unlock_irq(cdev->ccwlock);
/* Inform the user that set online failed. */ /* Inform the user that set online failed. */
if (cdev->private->state == DEV_STATE_BOXED) { if (cdev->private->state == DEV_STATE_BOXED) {
pr_warning("%s: Setting the device online failed " pr_warn("%s: Setting the device online failed because it is boxed\n",
"because it is boxed\n",
dev_name(&cdev->dev)); dev_name(&cdev->dev));
} else if (cdev->private->state == DEV_STATE_NOT_OPER) { } else if (cdev->private->state == DEV_STATE_NOT_OPER) {
pr_warning("%s: Setting the device online failed " pr_warn("%s: Setting the device online failed because it is not operational\n",
"because it is not operational\n",
dev_name(&cdev->dev)); dev_name(&cdev->dev));
} }
/* Give up online reference since onlining failed. */ /* Give up online reference since onlining failed. */
...@@ -619,8 +617,7 @@ initiate_logging(struct device *dev, struct device_attribute *attr, ...@@ -619,8 +617,7 @@ initiate_logging(struct device *dev, struct device_attribute *attr,
rc = chsc_siosl(sch->schid); rc = chsc_siosl(sch->schid);
if (rc < 0) { if (rc < 0) {
pr_warning("Logging for subchannel 0.%x.%04x failed with " pr_warn("Logging for subchannel 0.%x.%04x failed with errno=%d\n",
"errno=%d\n",
sch->schid.ssid, sch->schid.sch_no, rc); sch->schid.ssid, sch->schid.sch_no, rc);
return rc; return rc;
} }
......
...@@ -1761,7 +1761,7 @@ lcs_get_control(struct lcs_card *card, struct lcs_cmd *cmd) ...@@ -1761,7 +1761,7 @@ lcs_get_control(struct lcs_card *card, struct lcs_cmd *cmd)
lcs_schedule_recovery(card); lcs_schedule_recovery(card);
break; break;
case LCS_CMD_STOPLAN: case LCS_CMD_STOPLAN:
pr_warning("Stoplan for %s initiated by LGW.\n", pr_warn("Stoplan for %s initiated by LGW\n",
card->dev->name); card->dev->name);
if (card->dev) if (card->dev)
netif_carrier_off(card->dev); netif_carrier_off(card->dev);
......
...@@ -3624,7 +3624,7 @@ static int qeth_l3_register_notifiers(void) ...@@ -3624,7 +3624,7 @@ static int qeth_l3_register_notifiers(void)
return rc; return rc;
} }
#else #else
pr_warning("There is no IPv6 support for the layer 3 discipline\n"); pr_warn("There is no IPv6 support for the layer 3 discipline\n");
#endif #endif
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment