Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[powerpc.git] / drivers / s390 / block / dasd_erp.c
index b842377..caa5d91 100644 (file)
@@ -9,7 +9,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/ctype.h>
 #include <linux/init.h>
 
@@ -90,7 +89,7 @@ dasd_default_erp_action(struct dasd_ccw_req * cqr)
 
         /* just retry - there is nothing to save ... I got no sense data.... */
         if (cqr->retries > 0) {
-                DEV_MESSAGE (KERN_DEBUG, device, 
+               DEV_MESSAGE (KERN_DEBUG, device,
                              "default ERP called (%i retries left)",
                              cqr->retries);
                cqr->lpm    = LPM_ANYPATH;
@@ -153,25 +152,6 @@ dasd_default_erp_postaction(struct dasd_ccw_req * cqr)
 
 }                              /* end default_erp_postaction */
 
-/*
- * Print the hex dump of the memory used by a request. This includes
- * all error recovery ccws that have been chained in from of the 
- * real request.
- */
-static inline void
-hex_dump_memory(struct dasd_device *device, void *data, int len)
-{
-       int *pint;
-
-       pint = (int *) data;
-       while (len > 0) {
-               DEV_MESSAGE(KERN_ERR, device, "%p: %08x %08x %08x %08x",
-                           pint, pint[0], pint[1], pint[2], pint[3]);
-               pint += 4;
-               len -= 16;
-       }
-}
-
 void
 dasd_log_sense(struct dasd_ccw_req *cqr, struct irb *irb)
 {
@@ -183,69 +163,8 @@ dasd_log_sense(struct dasd_ccw_req *cqr, struct irb *irb)
                device->discipline->dump_sense(device, cqr, irb);
 }
 
-void
-dasd_log_ccw(struct dasd_ccw_req * cqr, int caller, __u32 cpa)
-{
-       struct dasd_device *device;
-       struct dasd_ccw_req *lcqr;
-       struct ccw1 *ccw;
-       int cplength;
-
-       device = cqr->device;
-       /* log the channel program */
-       for (lcqr = cqr; lcqr != NULL; lcqr = lcqr->refers) {
-               DEV_MESSAGE(KERN_ERR, device,
-                           "(%s) ERP chain report for req: %p",
-                           caller == 0 ? "EXAMINE" : "ACTION", lcqr);
-               hex_dump_memory(device, lcqr, sizeof(struct dasd_ccw_req));
-
-               cplength = 1;
-               ccw = lcqr->cpaddr;
-               while (ccw++->flags & (CCW_FLAG_DC | CCW_FLAG_CC))
-                       cplength++;
-
-               if (cplength > 40) {    /* log only parts of the CP */
-                       DEV_MESSAGE(KERN_ERR, device, "%s",
-                                   "Start of channel program:");
-                       hex_dump_memory(device, lcqr->cpaddr,
-                                       40*sizeof(struct ccw1));
-
-                       DEV_MESSAGE(KERN_ERR, device, "%s",
-                                   "End of channel program:");
-                       hex_dump_memory(device, lcqr->cpaddr + cplength - 10,
-                                       10*sizeof(struct ccw1));
-               } else {        /* log the whole CP */
-                       DEV_MESSAGE(KERN_ERR, device, "%s",
-                                   "Channel program (complete):");
-                       hex_dump_memory(device, lcqr->cpaddr,
-                                       cplength*sizeof(struct ccw1));
-               }
-
-               if (lcqr != cqr)
-                       continue;
-
-               /*
-                * Log bytes arround failed CCW but only if we did
-                * not log the whole CP of the CCW is outside the
-                * logged CP. 
-                */
-               if (cplength > 40 ||
-                   ((addr_t) cpa < (addr_t) lcqr->cpaddr &&
-                    (addr_t) cpa > (addr_t) (lcqr->cpaddr + cplength + 4))) {
-                       
-                       DEV_MESSAGE(KERN_ERR, device,
-                                   "Failed CCW (%p) (area):",
-                                   (void *) (long) cpa);
-                       hex_dump_memory(device, cqr->cpaddr - 10,
-                                       20*sizeof(struct ccw1));
-               }
-       }
-
-}                              /* end log_erp_chain */
-
 EXPORT_SYMBOL(dasd_default_erp_action);
 EXPORT_SYMBOL(dasd_default_erp_postaction);
 EXPORT_SYMBOL(dasd_alloc_erp_request);
 EXPORT_SYMBOL(dasd_free_erp_request);
 EXPORT_SYMBOL(dasd_log_sense);
-EXPORT_SYMBOL(dasd_log_ccw);