1 files changed, 9 insertions, 55 deletions

diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 4b0c85acb0f0..a96e5c3b9460 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -1,26 +1,11 @@
 /*
- * This file is part of the zfcp device driver for
- * FCP adapters for IBM System z9 and zSeries.
+ * zfcp device driver
  *
- * (C) Copyright IBM Corp. 2002, 2006
+ * Interface to Linux SCSI midlayer.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Copyright IBM Corporation 2002, 2008
  */
 
-#define ZFCP_LOG_AREA                   ZFCP_LOG_AREA_SCSI
-
 #include "zfcp_ext.h"
 #include <asm/atomic.h>
 
@@ -44,7 +29,7 @@ static struct device_attribute *zfcp_a_stats_attrs[];
 
 struct zfcp_data zfcp_data = {
         .scsi_host_template = {
-                .name                   = ZFCP_NAME,
+                .name                   = "zfcp",
                 .module                 = THIS_MODULE,
                 .proc_name              = "zfcp",
                 .slave_alloc            = zfcp_scsi_slave_alloc,
@@ -64,7 +49,6 @@ struct zfcp_data zfcp_data = {
                 .max_sectors            = ZFCP_MAX_SECTORS,
                 .shost_attrs            = zfcp_a_stats_attrs,
         },
-        .driver_version = ZFCP_VERSION,
 };
 
 /* Find start of Response Information in FCP response unit*/
@@ -181,16 +165,14 @@ zfcp_scsi_slave_alloc(struct scsi_device *sdp)
 static void zfcp_scsi_slave_destroy(struct scsi_device *sdpnt)
 {
         struct zfcp_unit *unit = (struct zfcp_unit *) sdpnt->hostdata;
-
+        WARN_ON(!unit);
         if (unit) {
                 atomic_clear_mask(ZFCP_STATUS_UNIT_REGISTERED, &unit->status);
                 sdpnt->hostdata = NULL;
                 unit->device = NULL;
                 zfcp_erp_unit_failed(unit, 12, NULL);
                 zfcp_unit_put(unit);
-        } else
-                ZFCP_LOG_NORMAL("bug: no unit associated with SCSI device at "
-                                "address %p\n", sdpnt);
+        }
 }
 
 /*
@@ -253,10 +235,6 @@ zfcp_scsi_command_async(struct zfcp_adapter *adapter, struct zfcp_unit *unit,
         if (unlikely(
               atomic_test_mask(ZFCP_STATUS_COMMON_ERP_FAILED, &unit->status) ||
              !atomic_test_mask(ZFCP_STATUS_COMMON_RUNNING, &unit->status))) {
-                ZFCP_LOG_DEBUG("stopping SCSI I/O on unit 0x%016Lx on port "
-                               "0x%016Lx on adapter %s\n",
-                               unit->fcp_lun, unit->port->wwpn,
-                               zfcp_get_busid_by_adapter(adapter));
                 zfcp_scsi_command_fail(scpnt, DID_ERROR);
                 goto out;
         }
@@ -264,18 +242,12 @@ zfcp_scsi_command_async(struct zfcp_adapter *adapter, struct zfcp_unit *unit,
         tmp = zfcp_fsf_send_fcp_command_task(adapter, unit, scpnt, use_timer,
                                              ZFCP_REQ_AUTO_CLEANUP);
         if (unlikely(tmp == -EBUSY)) {
-                ZFCP_LOG_DEBUG("adapter %s not ready or unit 0x%016Lx "
-                               "on port 0x%016Lx in recovery\n",
-                               zfcp_get_busid_by_unit(unit),
-                               unit->fcp_lun, unit->port->wwpn);
                 zfcp_scsi_command_fail(scpnt, DID_NO_CONNECT);
                 goto out;
         }
 
-        if (unlikely(tmp < 0)) {
-                ZFCP_LOG_DEBUG("error: initiation of Send FCP Cmnd failed\n");
+        if (unlikely(tmp < 0))
                 retval = SCSI_MLQUEUE_HOST_BUSY;
-        }
 
 out:
         return retval;
@@ -394,9 +366,6 @@ static int zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
         adapter = (struct zfcp_adapter *) scsi_host->hostdata[0];
         unit = (struct zfcp_unit *) scpnt->device->hostdata;
 
-        ZFCP_LOG_INFO("aborting scsi_cmnd=%p on adapter %s\n",
-                      scpnt, zfcp_get_busid_by_adapter(adapter));
-
         /* avoid race condition between late normal completion and abort */
         write_lock_irqsave(&adapter->abort_lock, flags);
 
@@ -420,7 +389,6 @@ static int zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
 
         fsf_req = zfcp_fsf_abort_fcp_command(old_req_id, adapter, unit, 0);
         if (!fsf_req) {
-                ZFCP_LOG_INFO("error: initiation of Abort FCP Cmnd failed\n");
                 zfcp_scsi_dbf_event_abort("nres", adapter, scpnt, NULL,
                                           old_req_id);
                 retval = FAILED;
@@ -485,10 +453,6 @@ zfcp_task_management_function(struct zfcp_unit *unit, u8 tm_flags,
         fsf_req = zfcp_fsf_send_fcp_command_task_management
                 (adapter, unit, tm_flags, 0);
         if (!fsf_req) {
-                ZFCP_LOG_INFO("error: creation of task management request "
-                              "failed for unit 0x%016Lx on port 0x%016Lx on  "
-                              "adapter %s\n", unit->fcp_lun, unit->port->wwpn,
-                              zfcp_get_busid_by_adapter(adapter));
                 zfcp_scsi_dbf_event_devreset("nres", tm_flags, unit, scpnt);
                 retval = -ENOMEM;
                 goto out;
@@ -524,12 +488,6 @@ static int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt)
 
         unit = (struct zfcp_unit*) scpnt->device->hostdata;
         adapter = unit->port->adapter;
-
-        ZFCP_LOG_NORMAL("host reset because of problems with "
-                "unit 0x%016Lx on port 0x%016Lx, adapter %s\n",
-                unit->fcp_lun, unit->port->wwpn,
-                zfcp_get_busid_by_adapter(unit->port->adapter));
-
         zfcp_erp_adapter_reopen(adapter, 0, 141, scpnt);
         zfcp_erp_wait(adapter);
 
@@ -549,13 +507,11 @@ zfcp_adapter_scsi_register(struct zfcp_adapter *adapter)
         adapter->scsi_host = scsi_host_alloc(&zfcp_data.scsi_host_template,
                                              sizeof (struct zfcp_adapter *));
         if (!adapter->scsi_host) {
-                ZFCP_LOG_NORMAL("error: registration with SCSI stack failed "
-                                "for adapter %s ",
-                                zfcp_get_busid_by_adapter(adapter));
+                dev_err(&adapter->ccw_device->dev,
+                        "registration with SCSI stack failed.");
                 retval = -EIO;
                 goto out;
         }
-        ZFCP_LOG_DEBUG("host registered, scsi_host=%p\n", adapter->scsi_host);
 
         /* tell the SCSI stack some characteristics of this adapter */
         adapter->scsi_host->max_id = 1;
@@ -987,5 +943,3 @@ static struct device_attribute *zfcp_a_stats_attrs[] = {
         &dev_attr_seconds_active,
         NULL
 };
-
-#undef ZFCP_LOG_AREA