diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/s390/char/monwriter.c | 2 | ||||
-rw-r--r-- | drivers/s390/char/vmlogrdr.c | 2 | ||||
-rw-r--r-- | drivers/s390/cio/chsc.c | 2 | ||||
-rw-r--r-- | drivers/s390/net/claw.c | 2 | ||||
-rw-r--r-- | drivers/s390/net/lcs.c | 2 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_fsf.c | 10 |
6 files changed, 10 insertions, 10 deletions
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c index 20442fbf9346..a86c0534cd49 100644 --- a/drivers/s390/char/monwriter.c +++ b/drivers/s390/char/monwriter.c | |||
@@ -295,7 +295,7 @@ module_init(mon_init); | |||
295 | module_exit(mon_exit); | 295 | module_exit(mon_exit); |
296 | 296 | ||
297 | module_param_named(max_bufs, mon_max_bufs, int, 0644); | 297 | module_param_named(max_bufs, mon_max_bufs, int, 0644); |
298 | MODULE_PARM_DESC(max_bufs, "Maximum number of sample monitor data buffers" | 298 | MODULE_PARM_DESC(max_bufs, "Maximum number of sample monitor data buffers " |
299 | "that can be active at one time"); | 299 | "that can be active at one time"); |
300 | 300 | ||
301 | MODULE_AUTHOR("Melissa Howland <Melissa.Howland@us.ibm.com>"); | 301 | MODULE_AUTHOR("Melissa Howland <Melissa.Howland@us.ibm.com>"); |
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c index e0c4c508e121..d364e0bfae12 100644 --- a/drivers/s390/char/vmlogrdr.c +++ b/drivers/s390/char/vmlogrdr.c | |||
@@ -683,7 +683,7 @@ static int vmlogrdr_register_driver(void) | |||
683 | /* Register with iucv driver */ | 683 | /* Register with iucv driver */ |
684 | ret = iucv_register(&vmlogrdr_iucv_handler, 1); | 684 | ret = iucv_register(&vmlogrdr_iucv_handler, 1); |
685 | if (ret) { | 685 | if (ret) { |
686 | printk (KERN_ERR "vmlogrdr: failed to register with" | 686 | printk (KERN_ERR "vmlogrdr: failed to register with " |
687 | "iucv driver\n"); | 687 | "iucv driver\n"); |
688 | goto out; | 688 | goto out; |
689 | } | 689 | } |
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c index 93e6f74187ee..e7ba16a74ef7 100644 --- a/drivers/s390/cio/chsc.c +++ b/drivers/s390/cio/chsc.c | |||
@@ -1042,7 +1042,7 @@ chsc_determine_css_characteristics(void) | |||
1042 | 1042 | ||
1043 | scsc_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA); | 1043 | scsc_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA); |
1044 | if (!scsc_area) { | 1044 | if (!scsc_area) { |
1045 | CIO_MSG_EVENT(0, "Was not able to determine available" | 1045 | CIO_MSG_EVENT(0, "Was not able to determine available " |
1046 | "CHSCs due to no memory.\n"); | 1046 | "CHSCs due to no memory.\n"); |
1047 | return -ENOMEM; | 1047 | return -ENOMEM; |
1048 | } | 1048 | } |
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c index 3561982749e3..c3076217871e 100644 --- a/drivers/s390/net/claw.c +++ b/drivers/s390/net/claw.c | |||
@@ -2416,7 +2416,7 @@ init_ccw_bk(struct net_device *dev) | |||
2416 | privptr->p_buff_pages_perwrite); | 2416 | privptr->p_buff_pages_perwrite); |
2417 | #endif | 2417 | #endif |
2418 | if (p_buff==NULL) { | 2418 | if (p_buff==NULL) { |
2419 | printk(KERN_INFO "%s:%s __get_free_pages" | 2419 | printk(KERN_INFO "%s:%s __get_free_pages " |
2420 | "for writes buf failed : get is for %d pages\n", | 2420 | "for writes buf failed : get is for %d pages\n", |
2421 | dev->name, | 2421 | dev->name, |
2422 | __FUNCTION__, | 2422 | __FUNCTION__, |
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index 0fd663b23d76..7bfe8d707a34 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c | |||
@@ -1115,7 +1115,7 @@ list_modified: | |||
1115 | rc = lcs_send_setipm(card, ipm); | 1115 | rc = lcs_send_setipm(card, ipm); |
1116 | spin_lock_irqsave(&card->ipm_lock, flags); | 1116 | spin_lock_irqsave(&card->ipm_lock, flags); |
1117 | if (rc) { | 1117 | if (rc) { |
1118 | PRINT_INFO("Adding multicast address failed." | 1118 | PRINT_INFO("Adding multicast address failed. " |
1119 | "Table possibly full!\n"); | 1119 | "Table possibly full!\n"); |
1120 | /* store ipm in failed list -> will be added | 1120 | /* store ipm in failed list -> will be added |
1121 | * to ipm_list again, so a retry will be done | 1121 | * to ipm_list again, so a retry will be done |
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index fe57941ab55d..e45f85f7c7ed 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c | |||
@@ -502,7 +502,7 @@ zfcp_fsf_fsfstatus_qual_eval(struct zfcp_fsf_req *fsf_req) | |||
502 | fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR; | 502 | fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR; |
503 | break; | 503 | break; |
504 | case FSF_SQ_NO_RECOM: | 504 | case FSF_SQ_NO_RECOM: |
505 | ZFCP_LOG_NORMAL("bug: No recommendation could be given for a" | 505 | ZFCP_LOG_NORMAL("bug: No recommendation could be given for a " |
506 | "problem on the adapter %s " | 506 | "problem on the adapter %s " |
507 | "Stopping all operations on this adapter. ", | 507 | "Stopping all operations on this adapter. ", |
508 | zfcp_get_busid_by_adapter(fsf_req->adapter)); | 508 | zfcp_get_busid_by_adapter(fsf_req->adapter)); |
@@ -813,7 +813,7 @@ zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *fsf_req) | |||
813 | read_unlock_irqrestore(&zfcp_data.config_lock, flags); | 813 | read_unlock_irqrestore(&zfcp_data.config_lock, flags); |
814 | 814 | ||
815 | if (!port || (port->d_id != (status_buffer->d_id & ZFCP_DID_MASK))) { | 815 | if (!port || (port->d_id != (status_buffer->d_id & ZFCP_DID_MASK))) { |
816 | ZFCP_LOG_NORMAL("bug: Reopen port indication received for" | 816 | ZFCP_LOG_NORMAL("bug: Reopen port indication received for " |
817 | "nonexisting port with d_id 0x%06x on " | 817 | "nonexisting port with d_id 0x%06x on " |
818 | "adapter %s. Ignored.\n", | 818 | "adapter %s. Ignored.\n", |
819 | status_buffer->d_id & ZFCP_DID_MASK, | 819 | status_buffer->d_id & ZFCP_DID_MASK, |
@@ -2281,7 +2281,7 @@ zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action) | |||
2281 | &lock_flags, &fsf_req); | 2281 | &lock_flags, &fsf_req); |
2282 | if (retval) { | 2282 | if (retval) { |
2283 | ZFCP_LOG_INFO("error: Out of resources. Could not create an " | 2283 | ZFCP_LOG_INFO("error: Out of resources. Could not create an " |
2284 | "exchange port data request for" | 2284 | "exchange port data request for " |
2285 | "the adapter %s.\n", | 2285 | "the adapter %s.\n", |
2286 | zfcp_get_busid_by_adapter(adapter)); | 2286 | zfcp_get_busid_by_adapter(adapter)); |
2287 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, | 2287 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, |
@@ -2340,7 +2340,7 @@ zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter, | |||
2340 | 0, NULL, &lock_flags, &fsf_req); | 2340 | 0, NULL, &lock_flags, &fsf_req); |
2341 | if (retval) { | 2341 | if (retval) { |
2342 | ZFCP_LOG_INFO("error: Out of resources. Could not create an " | 2342 | ZFCP_LOG_INFO("error: Out of resources. Could not create an " |
2343 | "exchange port data request for" | 2343 | "exchange port data request for " |
2344 | "the adapter %s.\n", | 2344 | "the adapter %s.\n", |
2345 | zfcp_get_busid_by_adapter(adapter)); | 2345 | zfcp_get_busid_by_adapter(adapter)); |
2346 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, | 2346 | write_unlock_irqrestore(&adapter->request_queue.queue_lock, |
@@ -4725,7 +4725,7 @@ zfcp_fsf_req_create(struct zfcp_adapter *adapter, u32 fsf_cmd, int req_flags, | |||
4725 | /* allocate new FSF request */ | 4725 | /* allocate new FSF request */ |
4726 | fsf_req = zfcp_fsf_req_alloc(pool, req_flags); | 4726 | fsf_req = zfcp_fsf_req_alloc(pool, req_flags); |
4727 | if (unlikely(NULL == fsf_req)) { | 4727 | if (unlikely(NULL == fsf_req)) { |
4728 | ZFCP_LOG_DEBUG("error: Could not put an FSF request into" | 4728 | ZFCP_LOG_DEBUG("error: Could not put an FSF request into " |
4729 | "the outbound (send) queue.\n"); | 4729 | "the outbound (send) queue.\n"); |
4730 | ret = -ENOMEM; | 4730 | ret = -ENOMEM; |
4731 | goto failed_fsf_req; | 4731 | goto failed_fsf_req; |