30 files changed, 256 insertions, 341 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 742d07403101..8d81a3a64c07 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -324,13 +324,13 @@ static boolean DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller)
       Command->Next = Controller->FreeCommands;
       Controller->FreeCommands = Command;
       Controller->Commands[CommandIdentifier-1] = Command;
-      ScatterGatherCPU = pci_pool_alloc(ScatterGatherPool, SLAB_ATOMIC,
+      ScatterGatherCPU = pci_pool_alloc(ScatterGatherPool, GFP_ATOMIC,
                                                         &ScatterGatherDMA);
       if (ScatterGatherCPU == NULL)
           return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION");
 
       if (RequestSensePool != NULL) {
-          RequestSenseCPU = pci_pool_alloc(RequestSensePool, SLAB_ATOMIC,
+          RequestSenseCPU = pci_pool_alloc(RequestSensePool, GFP_ATOMIC,
                                                 &RequestSenseDMA);
           if (RequestSenseCPU == NULL) {
                 pci_pool_free(ScatterGatherPool, ScatterGatherCPU,
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 17dc22282e14..85072446d772 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -168,7 +168,8 @@ config BLK_CPQ_CISS_DA
 
 config CISS_SCSI_TAPE
         bool "SCSI tape drive support for Smart Array 5xxx"
-        depends on BLK_CPQ_CISS_DA && SCSI && PROC_FS
+        depends on BLK_CPQ_CISS_DA && PROC_FS
+        depends on SCSI=y || SCSI=BLK_CPQ_CISS_DA
         help
           When enabled (Y), this option allows SCSI tape drives and SCSI medium
           changers (tape robots) to be accessed via a Compaq 5xxx array 
@@ -305,6 +306,7 @@ config BLK_DEV_LOOP
 config BLK_DEV_CRYPTOLOOP
         tristate "Cryptoloop Support"
         select CRYPTO
+        select CRYPTO_CBC
         depends on BLK_DEV_LOOP
         ---help---
           Say Y here if you want to be able to use the ciphers that are 
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index aa25f8b09fe3..478489c568a4 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -12,7 +12,7 @@
 #include <linux/netdevice.h>
 #include "aoe.h"
 
-static kmem_cache_t *buf_pool_cache;
+static struct kmem_cache *buf_pool_cache;
 
 static ssize_t aoedisk_show_state(struct gendisk * disk, char *page)
 {
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 4105c3bf3476..892e092afe9a 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -47,14 +47,15 @@
 #include <linux/completion.h>
 
 #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
-#define DRIVER_NAME "HP CISS Driver (v 3.6.10)"
-#define DRIVER_VERSION CCISS_DRIVER_VERSION(3,6,10)
+#define DRIVER_NAME "HP CISS Driver (v 3.6.14)"
+#define DRIVER_VERSION CCISS_DRIVER_VERSION(3,6,14)
 
 /* Embedded module documentation macros - see modules.h */
 MODULE_AUTHOR("Hewlett-Packard Company");
-MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 3.6.10");
+MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 3.6.14");
 MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"
                         " SA6i P600 P800 P400 P400i E200 E200i E500");
+MODULE_VERSION("3.6.14");
 MODULE_LICENSE("GPL");
 
 #include "cciss_cmd.h"
@@ -81,7 +82,9 @@ static const struct pci_device_id cciss_pci_device_id[] = {
         {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3213},
         {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3214},
         {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3215},
-        {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3233},
+        {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3237},
+        {PCI_VENDOR_ID_HP,     PCI_ANY_ID,      PCI_ANY_ID, PCI_ANY_ID,
+                PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
         {0,}
 };
 
@@ -90,27 +93,29 @@ MODULE_DEVICE_TABLE(pci, cciss_pci_device_id);
 /*  board_id = Subsystem Device ID & Vendor ID
  *  product = Marketing Name for the board
  *  access = Address of the struct of function pointers
+ *  nr_cmds = Number of commands supported by controller
  */
 static struct board_type products[] = {
-        {0x40700E11, "Smart Array 5300", &SA5_access},
-        {0x40800E11, "Smart Array 5i", &SA5B_access},
-        {0x40820E11, "Smart Array 532", &SA5B_access},
-        {0x40830E11, "Smart Array 5312", &SA5B_access},
-        {0x409A0E11, "Smart Array 641", &SA5_access},
-        {0x409B0E11, "Smart Array 642", &SA5_access},
-        {0x409C0E11, "Smart Array 6400", &SA5_access},
-        {0x409D0E11, "Smart Array 6400 EM", &SA5_access},
-        {0x40910E11, "Smart Array 6i", &SA5_access},
-        {0x3225103C, "Smart Array P600", &SA5_access},
-        {0x3223103C, "Smart Array P800", &SA5_access},
-        {0x3234103C, "Smart Array P400", &SA5_access},
-        {0x3235103C, "Smart Array P400i", &SA5_access},
-        {0x3211103C, "Smart Array E200i", &SA5_access},
-        {0x3212103C, "Smart Array E200", &SA5_access},
-        {0x3213103C, "Smart Array E200i", &SA5_access},
-        {0x3214103C, "Smart Array E200i", &SA5_access},
-        {0x3215103C, "Smart Array E200i", &SA5_access},
-        {0x3233103C, "Smart Array E500", &SA5_access},
+        {0x40700E11, "Smart Array 5300", &SA5_access, 512},
+        {0x40800E11, "Smart Array 5i", &SA5B_access, 512},
+        {0x40820E11, "Smart Array 532", &SA5B_access, 512},
+        {0x40830E11, "Smart Array 5312", &SA5B_access, 512},
+        {0x409A0E11, "Smart Array 641", &SA5_access, 512},
+        {0x409B0E11, "Smart Array 642", &SA5_access, 512},
+        {0x409C0E11, "Smart Array 6400", &SA5_access, 512},
+        {0x409D0E11, "Smart Array 6400 EM", &SA5_access, 512},
+        {0x40910E11, "Smart Array 6i", &SA5_access, 512},
+        {0x3225103C, "Smart Array P600", &SA5_access, 512},
+        {0x3223103C, "Smart Array P800", &SA5_access, 512},
+        {0x3234103C, "Smart Array P400", &SA5_access, 512},
+        {0x3235103C, "Smart Array P400i", &SA5_access, 512},
+        {0x3211103C, "Smart Array E200i", &SA5_access, 120},
+        {0x3212103C, "Smart Array E200", &SA5_access, 120},
+        {0x3213103C, "Smart Array E200i", &SA5_access, 120},
+        {0x3214103C, "Smart Array E200i", &SA5_access, 120},
+        {0x3215103C, "Smart Array E200i", &SA5_access, 120},
+        {0x3237103C, "Smart Array E500", &SA5_access, 512},
+        {0xFFFF103C, "Unknown Smart Array", &SA5_access, 120},
 };
 
 /* How long to wait (in milliseconds) for board to go into simple mode */
@@ -121,7 +126,6 @@ static struct board_type products[] = {
 #define MAX_CMD_RETRIES 3
 
 #define READ_AHEAD       1024
-#define NR_CMDS          384    /* #commands that can be outstanding */
 #define MAX_CTLR        32
 
 /* Originally cciss driver only supports 8 major numbers */
@@ -137,7 +141,6 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
                        unsigned int cmd, unsigned long arg);
 static int cciss_getgeo(struct block_device *bdev, struct hd_geometry *geo);
 
-static int revalidate_allvol(ctlr_info_t *host);
 static int cciss_revalidate(struct gendisk *disk);
 static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk);
 static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,
@@ -265,6 +268,7 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset,
                        "Firmware Version: %c%c%c%c\n"
                        "IRQ: %d\n"
                        "Logical drives: %d\n"
+                       "Max sectors: %d\n"
                        "Current Q depth: %d\n"
                        "Current # commands on controller: %d\n"
                        "Max Q depth since init: %d\n"
@@ -275,7 +279,9 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset,
                        (unsigned long)h->board_id,
                        h->firm_ver[0], h->firm_ver[1], h->firm_ver[2],
                        h->firm_ver[3], (unsigned int)h->intr[SIMPLE_MODE_INT],
-                       h->num_luns, h->Qdepth, h->commands_outstanding,
+                       h->num_luns,
+                       h->cciss_max_sectors,
+                       h->Qdepth, h->commands_outstanding,
                        h->maxQsinceinit, h->max_outstanding, h->maxSG);
 
         pos += size;
@@ -400,8 +406,8 @@ static CommandList_struct *cmd_alloc(ctlr_info_t *h, int get_from_pool)
         } else {                /* get it out of the controllers pool */
 
                 do {
-                        i = find_first_zero_bit(h->cmd_pool_bits, NR_CMDS);
-                        if (i == NR_CMDS)
+                        i = find_first_zero_bit(h->cmd_pool_bits, h->nr_cmds);
+                        if (i == h->nr_cmds)
                                 return NULL;
                 } while (test_and_set_bit
                          (i & (BITS_PER_LONG - 1),
@@ -487,7 +493,7 @@ static int cciss_open(struct inode *inode, struct file *filep)
          * but I'm already using way to many device nodes to claim another one
          * for "raw controller".
          */
-        if (drv->nr_blocks == 0) {
+        if (drv->heads == 0) {
                 if (iminor(inode) != 0) {       /* not node 0? */
                         /* if not node 0 make sure it is a partition = 0 */
                         if (iminor(inode) & 0x0f) {
@@ -850,9 +856,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
                 }
 
         case CCISS_REVALIDVOLS:
-                if (bdev != bdev->bd_contains || drv != host->drv)
-                        return -ENXIO;
-                return revalidate_allvol(host);
+                return rebuild_lun_table(host, NULL);
 
         case CCISS_GETLUNINFO:{
                         LogvolInfo_struct luninfo;
@@ -1152,75 +1156,6 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
         }
 }
 
-/*
- * revalidate_allvol is for online array config utilities.  After a
- * utility reconfigures the drives in the array, it can use this function
- * (through an ioctl) to make the driver zap any previous disk structs for
- * that controller and get new ones.
- *
- * Right now I'm using the getgeometry() function to do this, but this
- * function should probably be finer grained and allow you to revalidate one
- * particular logical volume (instead of all of them on a particular
- * controller).
- */
-static int revalidate_allvol(ctlr_info_t *host)
-{
-        int ctlr = host->ctlr, i;
-        unsigned long flags;
-
-        spin_lock_irqsave(CCISS_LOCK(ctlr), flags);
-        if (host->usage_count > 1) {
-                spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);
-                printk(KERN_WARNING "cciss: Device busy for volume"
-                       " revalidation (usage=%d)\n", host->usage_count);
-                return -EBUSY;
-        }
-        host->usage_count++;
-        spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);
-
-        for (i = 0; i < NWD; i++) {
-                struct gendisk *disk = host->gendisk[i];
-                if (disk) {
-                        request_queue_t *q = disk->queue;
-
-                        if (disk->flags & GENHD_FL_UP)
-                                del_gendisk(disk);
-                        if (q)
-                                blk_cleanup_queue(q);
-                }
-        }
-
-        /*
-         * Set the partition and block size structures for all volumes
-         * on this controller to zero.  We will reread all of this data
-         */
-        memset(host->drv, 0, sizeof(drive_info_struct)
-               * CISS_MAX_LUN);
-        /*
-         * Tell the array controller not to give us any interrupts while
-         * we check the new geometry.  Then turn interrupts back on when
-         * we're done.
-         */
-        host->access.set_intr_mask(host, CCISS_INTR_OFF);
-        cciss_getgeometry(ctlr);
-        host->access.set_intr_mask(host, CCISS_INTR_ON);
-
-        /* Loop through each real device */
-        for (i = 0; i < NWD; i++) {
-                struct gendisk *disk = host->gendisk[i];
-                drive_info_struct *drv = &(host->drv[i]);
-                /* we must register the controller even if no disks exist */
-                /* this is for the online array utilities */
-                if (!drv->heads && i)
-                        continue;
-                blk_queue_hardsect_size(drv->queue, drv->block_size);
-                set_capacity(disk, drv->nr_blocks);
-                add_disk(disk);
-        }
-        host->usage_count--;
-        return 0;
-}
-
 static inline void complete_buffers(struct bio *bio, int status)
 {
         while (bio) {
@@ -1243,7 +1178,7 @@ static void cciss_check_queues(ctlr_info_t *h)
          * in case the interrupt we serviced was from an ioctl and did not
          * free any new commands.
          */
-        if ((find_first_zero_bit(h->cmd_pool_bits, NR_CMDS)) == NR_CMDS)
+        if ((find_first_zero_bit(h->cmd_pool_bits, h->nr_cmds)) == h->nr_cmds)
                 return;
 
         /* We have room on the queue for more commands.  Now we need to queue
@@ -1262,7 +1197,7 @@ static void cciss_check_queues(ctlr_info_t *h)
                 /* check to see if we have maxed out the number of commands
                  * that can be placed on the queue.
                  */
-                if ((find_first_zero_bit(h->cmd_pool_bits, NR_CMDS)) == NR_CMDS) {
+                if ((find_first_zero_bit(h->cmd_pool_bits, h->nr_cmds)) == h->nr_cmds) {
                         if (curr_queue == start_queue) {
                                 h->next_to_run =
                                     (start_queue + 1) % (h->highest_lun + 1);
@@ -1380,6 +1315,11 @@ static void cciss_update_drive_info(int ctlr, int drv_index)
         /* if it's the controller it's already added */
         if (drv_index) {
                 disk->queue = blk_init_queue(do_cciss_request, &h->lock);
+                sprintf(disk->disk_name, "cciss/c%dd%d", ctlr, drv_index);
+                disk->major = h->major;
+                disk->first_minor = drv_index << NWD_SHIFT;
+                disk->fops = &cciss_fops;
+                disk->private_data = &h->drv[drv_index];
 
                 /* Set up queue information */
                 disk->queue->backing_dev_info.ra_pages = READ_AHEAD;
@@ -1391,7 +1331,7 @@ static void cciss_update_drive_info(int ctlr, int drv_index)
                 /* This is a limit in the driver and could be eliminated. */
                 blk_queue_max_phys_segments(disk->queue, MAXSGENTRIES);
 
-                blk_queue_max_sectors(disk->queue, 512);
+                blk_queue_max_sectors(disk->queue, h->cciss_max_sectors);
 
                 blk_queue_softirq_done(disk->queue, cciss_softirq_done);
 
@@ -1458,11 +1398,6 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)
 
         /* Set busy_configuring flag for this operation */
         spin_lock_irqsave(CCISS_LOCK(h->ctlr), flags);
-        if (h->num_luns >= CISS_MAX_LUN) {
-                spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags);
-                return -EINVAL;
-        }
-
         if (h->busy_configuring) {
                 spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags);
                 return -EBUSY;
@@ -1495,17 +1430,8 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)
                                               0, 0, TYPE_CMD);
 
                 if (return_code == IO_OK) {
-                        listlength |=
-                            (0xff & (unsigned int)(ld_buff->LUNListLength[0]))
-                            << 24;
-                        listlength |=
-                            (0xff & (unsigned int)(ld_buff->LUNListLength[1]))
-                            << 16;
-                        listlength |=
-                            (0xff & (unsigned int)(ld_buff->LUNListLength[2]))
-                            << 8;
-                        listlength |=
-                            0xff & (unsigned int)(ld_buff->LUNListLength[3]);
+                        listlength =
+                                be32_to_cpu(*(__u32 *) ld_buff->LUNListLength);
                 } else {        /* reading number of logical volumes failed */
                         printk(KERN_WARNING "cciss: report logical volume"
                                " command failed\n");
@@ -1556,6 +1482,14 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)
                                 if (drv_index == -1)
                                         goto freeret;
 
+                                /*Check if the gendisk needs to be allocated */
+                                if (!h->gendisk[drv_index]){
+                                        h->gendisk[drv_index] = alloc_disk(1 << NWD_SHIFT);
+                                        if (!h->gendisk[drv_index]){
+                                                printk(KERN_ERR "cciss: could not allocate new disk %d\n", drv_index);
+                                                goto mem_msg;
+                                        }
+                                }
                         }
                         h->drv[drv_index].LunID = lunid;
                         cciss_update_drive_info(ctlr, drv_index);
@@ -1593,6 +1527,7 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)
 static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,
                            int clear_all)
 {
+        int i;
         ctlr_info_t *h = get_host(disk);
 
         if (!capable(CAP_SYS_RAWIO))
@@ -1616,9 +1551,35 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,
                                 del_gendisk(disk);
                         if (q) {
                                 blk_cleanup_queue(q);
+                                /* Set drv->queue to NULL so that we do not try
+                                 * to call blk_start_queue on this queue in the
+                                 * interrupt handler
+                                 */
                                 drv->queue = NULL;
                         }
+                        /* If clear_all is set then we are deleting the logical
+                         * drive, not just refreshing its info.  For drives
+                         * other than disk 0 we will call put_disk.  We do not
+                         * do this for disk 0 as we need it to be able to
+                         * configure the controller.
+                        */
+                        if (clear_all){
+                                /* This isn't pretty, but we need to find the
+                                 * disk in our array and NULL our the pointer.
+                                 * This is so that we will call alloc_disk if
+                                 * this index is used again later.
+                                */
+                                for (i=0; i < CISS_MAX_LUN; i++){
+                                        if(h->gendisk[i] == disk){
+                                                h->gendisk[i] = NULL;
+                                                break;
+                                        }
+                                }
+                                put_disk(disk);
+                        }
                 }
+        } else {
+                set_capacity(disk, 0);
         }
 
         --h->num_luns;
@@ -2136,7 +2097,7 @@ static int add_sendcmd_reject(__u8 cmd, int ctlr, unsigned long complete)
 
         /* We've sent down an abort or reset, but something else
            has completed */
-        if (srl->ncompletions >= (NR_CMDS + 2)) {
+        if (srl->ncompletions >= (hba[ctlr]->nr_cmds + 2)) {
                 /* Uh oh.  No room to save it for later... */
                 printk(KERN_WARNING "cciss%d: Sendcmd: Invalid command addr, "
                        "reject list overflow, command lost!\n", ctlr);
@@ -2673,7 +2634,7 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id)
                         a1 = a;
                         if ((a & 0x04)) {
                                 a2 = (a >> 3);
-                                if (a2 >= NR_CMDS) {
+                                if (a2 >= h->nr_cmds) {
                                         printk(KERN_WARNING
                                                "cciss: controller cciss%d failed, stopping.\n",
                                                h->ctlr);
@@ -2827,23 +2788,21 @@ static void __devinit cciss_interrupt_mode(ctlr_info_t *c,
                 if (err > 0) {
                         printk(KERN_WARNING "cciss: only %d MSI-X vectors "
                                "available\n", err);
+                        goto default_int_mode;
                 } else {
                         printk(KERN_WARNING "cciss: MSI-X init failed %d\n",
                                err);
+                        goto default_int_mode;
                 }
         }
         if (pci_find_capability(pdev, PCI_CAP_ID_MSI)) {
                 if (!pci_enable_msi(pdev)) {
-                        c->intr[SIMPLE_MODE_INT] = pdev->irq;
                         c->msi_vector = 1;
-                        return;
                 } else {
                         printk(KERN_WARNING "cciss: MSI init failed\n");
-                        c->intr[SIMPLE_MODE_INT] = pdev->irq;
-                        return;
                 }
         }
-      default_int_mode:
+default_int_mode:
 #endif                          /* CONFIG_PCI_MSI */
         /* if we get here we're going to use the default interrupt mode */
         c->intr[SIMPLE_MODE_INT] = pdev->irq;
@@ -2956,16 +2915,10 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
                 if (board_id == products[i].board_id) {
                         c->product_name = products[i].product_name;
                         c->access = *(products[i].access);
+                        c->nr_cmds = products[i].nr_cmds;
                         break;
                 }
         }
-        if (i == ARRAY_SIZE(products)) {
-                printk(KERN_WARNING "cciss: Sorry, I don't know how"
-                       " to access the Smart Array controller %08lx\n",
-                       (unsigned long)board_id);
-                err = -ENODEV;
-                goto err_out_free_res;
-        }
         if ((readb(&c->cfgtable->Signature[0]) != 'C') ||
             (readb(&c->cfgtable->Signature[1]) != 'I') ||
             (readb(&c->cfgtable->Signature[2]) != 'S') ||
@@ -2974,6 +2927,27 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
                 err = -ENODEV;
                 goto err_out_free_res;
         }
+        /* We didn't find the controller in our list. We know the
+         * signature is valid. If it's an HP device let's try to
+         * bind to the device and fire it up. Otherwise we bail.
+         */
+        if (i == ARRAY_SIZE(products)) {
+                if (subsystem_vendor_id == PCI_VENDOR_ID_HP) {
+                        c->product_name = products[i-1].product_name;
+                        c->access = *(products[i-1].access);
+                        c->nr_cmds = products[i-1].nr_cmds;
+                        printk(KERN_WARNING "cciss: This is an unknown "
+                                "Smart Array controller.\n"
+                                "cciss: Please update to the latest driver "
+                                "available from www.hp.com.\n");
+                } else {
+                        printk(KERN_WARNING "cciss: Sorry, I don't know how"
+                                " to access the Smart Array controller %08lx\n"
+                                        , (unsigned long)board_id);
+                        err = -ENODEV;
+                        goto err_out_free_res;
+                }
+        }
 #ifdef CONFIG_X86
         {
                 /* Need to enable prefetch in the SCSI core for 6400 in x86 */
@@ -2984,6 +2958,17 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
         }
 #endif
 
+        /* Disabling DMA prefetch for the P600
+         * An ASIC bug may result in a prefetch beyond
+         * physical memory.
+         */
+        if(board_id == 0x3225103C) {
+                __u32 dma_prefetch;
+                dma_prefetch = readl(c->vaddr + I2O_DMA1_CFG);
+                dma_prefetch |= 0x8000;
+                writel(dma_prefetch, c->vaddr + I2O_DMA1_CFG);
+        }
+
 #ifdef CCISS_DEBUG
         printk("Trying to put board into Simple mode\n");
 #endif                          /* CCISS_DEBUG */
@@ -3158,13 +3143,7 @@ geo_inq:
 /* Returns -1 if no free entries are left.  */
 static int alloc_cciss_hba(void)
 {
-        struct gendisk *disk[NWD];
-        int i, n;
-        for (n = 0; n < NWD; n++) {
-                disk[n] = alloc_disk(1 << NWD_SHIFT);
-                if (!disk[n])
-                        goto out;
-        }
+        int i;
 
         for (i = 0; i < MAX_CTLR; i++) {
                 if (!hba[i]) {
@@ -3172,20 +3151,18 @@ static int alloc_cciss_hba(void)
                         p = kzalloc(sizeof(ctlr_info_t), GFP_KERNEL);
                         if (!p)
                                 goto Enomem;
-                        for (n = 0; n < NWD; n++)
-                                p->gendisk[n] = disk[n];
+                        p->gendisk[0] = alloc_disk(1 << NWD_SHIFT);
+                        if (!p->gendisk[0])
+                                goto Enomem;
                         hba[i] = p;
                         return i;
                 }
         }
         printk(KERN_WARNING "cciss: This driver supports a maximum"
                " of %d controllers.\n", MAX_CTLR);
-        goto out;
-      Enomem:
+        return -1;
+Enomem:
         printk(KERN_ERR "cciss: out of memory.\n");
-      out:
-        while (n--)
-                put_disk(disk[n]);
         return -1;
 }
 
@@ -3195,7 +3172,7 @@ static void free_hba(int i)
         int n;
 
         hba[i] = NULL;
-        for (n = 0; n < NWD; n++)
+        for (n = 0; n < CISS_MAX_LUN; n++)
                 put_disk(p->gendisk[n]);
         kfree(p);
 }
@@ -3208,9 +3185,8 @@ static void free_hba(int i)
 static int __devinit cciss_init_one(struct pci_dev *pdev,
                                     const struct pci_device_id *ent)
 {
-        request_queue_t *q;
         int i;
-        int j;
+        int j = 0;
         int rc;
         int dac;
 
@@ -3269,15 +3245,15 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
                hba[i]->intr[SIMPLE_MODE_INT], dac ? "" : " not");
 
         hba[i]->cmd_pool_bits =
-            kmalloc(((NR_CMDS + BITS_PER_LONG -
+            kmalloc(((hba[i]->nr_cmds + BITS_PER_LONG -
                       1) / BITS_PER_LONG) * sizeof(unsigned long), GFP_KERNEL);
         hba[i]->cmd_pool = (CommandList_struct *)
             pci_alloc_consistent(hba[i]->pdev,
-                    NR_CMDS * sizeof(CommandList_struct),
+                    hba[i]->nr_cmds * sizeof(CommandList_struct),
                     &(hba[i]->cmd_pool_dhandle));
         hba[i]->errinfo_pool = (ErrorInfo_struct *)
             pci_alloc_consistent(hba[i]->pdev,
-                    NR_CMDS * sizeof(ErrorInfo_struct),
+                    hba[i]->nr_cmds * sizeof(ErrorInfo_struct),
                     &(hba[i]->errinfo_pool_dhandle));
         if ((hba[i]->cmd_pool_bits == NULL)
             || (hba[i]->cmd_pool == NULL)
@@ -3288,7 +3264,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
 #ifdef CONFIG_CISS_SCSI_TAPE
         hba[i]->scsi_rejects.complete =
             kmalloc(sizeof(hba[i]->scsi_rejects.complete[0]) *
-                    (NR_CMDS + 5), GFP_KERNEL);
+                    (hba[i]->nr_cmds + 5), GFP_KERNEL);
         if (hba[i]->scsi_rejects.complete == NULL) {
                 printk(KERN_ERR "cciss: out of memory");
                 goto clean4;
@@ -3302,7 +3278,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
         /* command and error info recs zeroed out before
            they are used */
         memset(hba[i]->cmd_pool_bits, 0,
-               ((NR_CMDS + BITS_PER_LONG -
+               ((hba[i]->nr_cmds + BITS_PER_LONG -
                  1) / BITS_PER_LONG) * sizeof(unsigned long));
 
 #ifdef CCISS_DEBUG
@@ -3317,18 +3293,34 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
         hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_ON);
 
         cciss_procinit(i);
+
+        hba[i]->cciss_max_sectors = 2048;
+
         hba[i]->busy_initializing = 0;
 
-        for (j = 0; j < NWD; j++) {     /* mfm */
+        do {
                 drive_info_struct *drv = &(hba[i]->drv[j]);
                 struct gendisk *disk = hba[i]->gendisk[j];
+                request_queue_t *q;
+
+                /* Check if the disk was allocated already */
+                if (!disk){
+                        hba[i]->gendisk[j] = alloc_disk(1 << NWD_SHIFT);
+                        disk = hba[i]->gendisk[j];
+                }
+
+                /* Check that the disk was able to be allocated */
+                if (!disk) {
+                        printk(KERN_ERR "cciss: unable to allocate memory for disk %d\n", j);
+                        goto clean4;
+                }
 
                 q = blk_init_queue(do_cciss_request, &hba[i]->lock);
                 if (!q) {
                         printk(KERN_ERR
                                "cciss:  unable to allocate queue for disk %d\n",
                                j);
-                        break;
+                        goto clean4;
                 }
                 drv->queue = q;
 
@@ -3341,7 +3333,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
                 /* This is a limit in the driver and could be eliminated. */
                 blk_queue_max_phys_segments(q, MAXSGENTRIES);
 
-                blk_queue_max_sectors(q, 512);
+                blk_queue_max_sectors(q, hba[i]->cciss_max_sectors);
 
                 blk_queue_softirq_done(q, cciss_softirq_done);
 
@@ -3360,7 +3352,8 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
                 blk_queue_hardsect_size(q, drv->block_size);
                 set_capacity(disk, drv->nr_blocks);
                 add_disk(disk);
-        }
+                j++;
+        } while (j <= hba[i]->highest_lun);
 
         return 1;
 
@@ -3371,11 +3364,11 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
         kfree(hba[i]->cmd_pool_bits);
         if (hba[i]->cmd_pool)
                 pci_free_consistent(hba[i]->pdev,
-                                    NR_CMDS * sizeof(CommandList_struct),
+                                    hba[i]->nr_cmds * sizeof(CommandList_struct),
                                     hba[i]->cmd_pool, hba[i]->cmd_pool_dhandle);
         if (hba[i]->errinfo_pool)
                 pci_free_consistent(hba[i]->pdev,
-                                    NR_CMDS * sizeof(ErrorInfo_struct),
+                                    hba[i]->nr_cmds * sizeof(ErrorInfo_struct),
                                     hba[i]->errinfo_pool,
                                     hba[i]->errinfo_pool_dhandle);
         free_irq(hba[i]->intr[SIMPLE_MODE_INT], hba[i]);
@@ -3383,6 +3376,15 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
         unregister_blkdev(hba[i]->major, hba[i]->devname);
       clean1:
         hba[i]->busy_initializing = 0;
+        /* cleanup any queues that may have been initialized */
+        for (j=0; j <= hba[i]->highest_lun; j++){
+                drive_info_struct *drv = &(hba[i]->drv[j]);
+                if (drv->queue)
+                        blk_cleanup_queue(drv->queue);
+        }
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
         free_hba(i);
         return -1;
 }
@@ -3430,7 +3432,7 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev)
         remove_proc_entry(hba[i]->devname, proc_cciss);
 
         /* remove it from the disk list */
-        for (j = 0; j < NWD; j++) {
+        for (j = 0; j < CISS_MAX_LUN; j++) {
                 struct gendisk *disk = hba[i]->gendisk[j];
                 if (disk) {
                         request_queue_t *q = disk->queue;
@@ -3442,9 +3444,9 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev)
                 }
         }
 
-        pci_free_consistent(hba[i]->pdev, NR_CMDS * sizeof(CommandList_struct),
+        pci_free_consistent(hba[i]->pdev, hba[i]->nr_cmds * sizeof(CommandList_struct),
                             hba[i]->cmd_pool, hba[i]->cmd_pool_dhandle);
-        pci_free_consistent(hba[i]->pdev, NR_CMDS * sizeof(ErrorInfo_struct),
+        pci_free_consistent(hba[i]->pdev, hba[i]->nr_cmds * sizeof(ErrorInfo_struct),
                             hba[i]->errinfo_pool, hba[i]->errinfo_pool_dhandle);
         kfree(hba[i]->cmd_pool_bits);
 #ifdef CONFIG_CISS_SCSI_TAPE
diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index 562235c1445a..b70988dd33ec 100644
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -6,7 +6,6 @@
 #include "cciss_cmd.h"
 
 
-#define NWD             16
 #define NWD_SHIFT       4
 #define MAX_PART        (1 << NWD_SHIFT)
 
@@ -60,6 +59,7 @@ struct ctlr_info
         __u32   board_id;
         void __iomem *vaddr;
         unsigned long paddr;
+        int     nr_cmds; /* Number of commands allowed on this controller */
         CfgTable_struct __iomem *cfgtable;
         int     interrupts_enabled;
         int     major;
@@ -76,6 +76,7 @@ struct ctlr_info
         unsigned int intr[4];
         unsigned int msix_vector;
         unsigned int msi_vector;
+        int     cciss_max_sectors;
         BYTE    cciss_read;
         BYTE    cciss_write;
         BYTE    cciss_read_capacity;
@@ -110,7 +111,7 @@ struct ctlr_info
         int                     next_to_run;
 
         // Disk structures we need to pass back
-        struct gendisk   *gendisk[NWD];
+        struct gendisk   *gendisk[CISS_MAX_LUN];
 #ifdef CONFIG_CISS_SCSI_TAPE
         void *scsi_ctlr; /* ptr to structure containing scsi related stuff */
         /* list of block side commands the scsi error handling sucked up */
@@ -282,6 +283,7 @@ struct board_type {
         __u32   board_id;
         char    *product_name;
         struct access_method *access;
+        int nr_cmds; /* Max cmds this kind of ctlr can handle. */
 };
 
 #define CCISS_LOCK(i)   (&hba[i]->lock)
diff --git a/drivers/block/cciss_cmd.h b/drivers/block/cciss_cmd.h
index 4af7c4c0c7af..43bf5593b59b 100644
--- a/drivers/block/cciss_cmd.h
+++ b/drivers/block/cciss_cmd.h
@@ -55,6 +55,7 @@
 #define I2O_INT_MASK            0x34
 #define I2O_IBPOST_Q            0x40
 #define I2O_OBPOST_Q            0x44
+#define I2O_DMA1_CFG            0x214
 
 //Configuration Table
 #define CFGTBL_ChangeReq        0x00000001l
@@ -88,7 +89,7 @@ typedef union _u64bit
 //###########################################################################
 //STRUCTURES
 //###########################################################################
-#define CISS_MAX_LUN    16      
+#define CISS_MAX_LUN    1024
 #define CISS_MAX_PHYS_LUN       1024
 // SCSI-3 Cmmands 
 
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 9d1035e8d9d8..7bf2cfbd6285 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -355,14 +355,30 @@ harderror:
         return NULL;
 }
 
+static ssize_t pid_show(struct gendisk *disk, char *page)
+{
+        return sprintf(page, "%ld\n",
+                (long) ((struct nbd_device *)disk->private_data)->pid);
+}
+
+static struct disk_attribute pid_attr = {
+        .attr = { .name = "pid", .mode = S_IRUGO },
+        .show = pid_show,
+};
+
 static void nbd_do_it(struct nbd_device *lo)
 {
         struct request *req;
 
         BUG_ON(lo->magic != LO_MAGIC);
 
+        lo->pid = current->pid;
+        sysfs_create_file(&lo->disk->kobj, &pid_attr.attr);
+
         while ((req = nbd_read_stat(lo)) != NULL)
                 nbd_end_request(req);
+
+        sysfs_remove_file(&lo->disk->kobj, &pid_attr.attr);
         return;
 }
 
diff --git a/drivers/block/paride/aten.c b/drivers/block/paride/aten.c
index c4d696d43dc1..2695465568ad 100644
--- a/drivers/block/paride/aten.c
+++ b/drivers/block/paride/aten.c
@@ -149,12 +149,12 @@ static struct pi_protocol aten = {
 
 static int __init aten_init(void)
 {
-        return pi_register(&aten)-1;
+        return paride_register(&aten);
 }
 
 static void __exit aten_exit(void)
 {
-        pi_unregister( &aten );
+        paride_unregister( &aten );
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/bpck.c b/drivers/block/paride/bpck.c
index d462ff6b139d..4f27e7392e38 100644
--- a/drivers/block/paride/bpck.c
+++ b/drivers/block/paride/bpck.c
@@ -464,12 +464,12 @@ static struct pi_protocol bpck = {
 
 static int __init bpck_init(void)
 {
-        return pi_register(&bpck)-1;
+        return paride_register(&bpck);
 }
 
 static void __exit bpck_exit(void)
 {
-        pi_unregister(&bpck);
+        paride_unregister(&bpck);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/bpck6.c b/drivers/block/paride/bpck6.c
index 41a237c5957d..ad124525ac23 100644
--- a/drivers/block/paride/bpck6.c
+++ b/drivers/block/paride/bpck6.c
@@ -31,10 +31,7 @@ static int verbose; /* set this to 1 to see debugging messages and whatnot */
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <asm/io.h>
-
-#if defined(CONFIG_PARPORT_MODULE)||defined(CONFIG_PARPORT)
 #include <linux/parport.h>
-#endif
 
 #include "ppc6lnx.c"
 #include "paride.h"
@@ -139,11 +136,6 @@ static int bpck6_test_port ( PIA *pi )   /* check for 8-bit port */
         PPCSTRUCT(pi)->ppc_id=pi->unit;
         PPCSTRUCT(pi)->lpt_addr=pi->port;
 
-#ifdef CONFIG_PARPORT_PC_MODULE
-#define CONFIG_PARPORT_PC
-#endif
-
-#ifdef CONFIG_PARPORT_PC
         /* look at the parport device to see if what modes we can use */
         if(((struct pardevice *)(pi->pardev))->port->modes & 
                 (PARPORT_MODE_EPP)
@@ -161,11 +153,6 @@ static int bpck6_test_port ( PIA *pi )   /* check for 8-bit port */
         {
                 return 1;
         }
-#else
-        /* there is no way of knowing what kind of port we have
-           default to the highest mode possible */
-        return 5;
-#endif
 }
 
 static int bpck6_probe_unit ( PIA *pi )
@@ -265,12 +252,12 @@ static int __init bpck6_init(void)
         printk(KERN_INFO "bpck6: Copyright 2001 by Micro Solutions, Inc., DeKalb IL. USA\n");
         if(verbose)
                 printk(KERN_DEBUG "bpck6: verbose debug enabled.\n");
-        return pi_register(&bpck6) - 1;  
+        return paride_register(&bpck6);
 }
 
 static void __exit bpck6_exit(void)
 {
-        pi_unregister(&bpck6);
+        paride_unregister(&bpck6);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/comm.c b/drivers/block/paride/comm.c
index 43d61359d8ec..9bcd35495323 100644
--- a/drivers/block/paride/comm.c
+++ b/drivers/block/paride/comm.c
@@ -205,12 +205,12 @@ static struct pi_protocol comm = {
 
 static int __init comm_init(void)
 {
-        return pi_register(&comm)-1;
+        return paride_register(&comm);
 }
 
 static void __exit comm_exit(void)
 {
-        pi_unregister(&comm);
+        paride_unregister(&comm);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/dstr.c b/drivers/block/paride/dstr.c
index 04d53bf58e8c..accc5c777cbb 100644
--- a/drivers/block/paride/dstr.c
+++ b/drivers/block/paride/dstr.c
@@ -220,12 +220,12 @@ static struct pi_protocol dstr = {
 
 static int __init dstr_init(void)
 {
-        return pi_register(&dstr)-1;
+        return paride_register(&dstr);
 }
 
 static void __exit dstr_exit(void)
 {
-        pi_unregister(&dstr);
+        paride_unregister(&dstr);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/epat.c b/drivers/block/paride/epat.c
index 55d1c0a1fb90..1bcdff77322e 100644
--- a/drivers/block/paride/epat.c
+++ b/drivers/block/paride/epat.c
@@ -327,12 +327,12 @@ static int __init epat_init(void)
 #ifdef CONFIG_PARIDE_EPATC8
         epatc8 = 1;
 #endif
-        return pi_register(&epat)-1;
+        return paride_register(&epat);
 }
 
 static void __exit epat_exit(void)
 {
-        pi_unregister(&epat);
+        paride_unregister(&epat);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/epia.c b/drivers/block/paride/epia.c
index 0f2e0c292d82..fb0e782d055e 100644
--- a/drivers/block/paride/epia.c
+++ b/drivers/block/paride/epia.c
@@ -303,12 +303,12 @@ static struct pi_protocol epia = {
 
 static int __init epia_init(void)
 {
-        return pi_register(&epia)-1;
+        return paride_register(&epia);
 }
 
 static void __exit epia_exit(void)
 {
-        pi_unregister(&epia);
+        paride_unregister(&epia);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/fit2.c b/drivers/block/paride/fit2.c
index e0f0691d8bc2..381283753ae4 100644
--- a/drivers/block/paride/fit2.c
+++ b/drivers/block/paride/fit2.c
@@ -138,12 +138,12 @@ static struct pi_protocol fit2 = {
 
 static int __init fit2_init(void)
 {
-        return pi_register(&fit2)-1;
+        return paride_register(&fit2);
 }
 
 static void __exit fit2_exit(void)
 {
-        pi_unregister(&fit2);
+        paride_unregister(&fit2);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/fit3.c b/drivers/block/paride/fit3.c
index 15400e7bc666..275d269458eb 100644
--- a/drivers/block/paride/fit3.c
+++ b/drivers/block/paride/fit3.c
@@ -198,12 +198,12 @@ static struct pi_protocol fit3 = {
 
 static int __init fit3_init(void)
 {
-        return pi_register(&fit3)-1;
+        return paride_register(&fit3);
 }
 
 static void __exit fit3_exit(void)
 {
-        pi_unregister(&fit3);
+        paride_unregister(&fit3);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/friq.c b/drivers/block/paride/friq.c
index 5ea2904d2815..4f2ba244689b 100644
--- a/drivers/block/paride/friq.c
+++ b/drivers/block/paride/friq.c
@@ -263,12 +263,12 @@ static struct pi_protocol friq = {
 
 static int __init friq_init(void)
 {
-        return pi_register(&friq)-1;
+        return paride_register(&friq);
 }
 
 static void __exit friq_exit(void)
 {
-        pi_unregister(&friq);
+        paride_unregister(&friq);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/frpw.c b/drivers/block/paride/frpw.c
index 56b3824b1538..c3cde364603a 100644
--- a/drivers/block/paride/frpw.c
+++ b/drivers/block/paride/frpw.c
@@ -300,12 +300,12 @@ static struct pi_protocol frpw = {
 
 static int __init frpw_init(void)
 {
-        return pi_register(&frpw)-1;
+        return paride_register(&frpw);
 }
 
 static void __exit frpw_exit(void)
 {
-        pi_unregister(&frpw);
+        paride_unregister(&frpw);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/jumbo b/drivers/block/paride/jumbo
deleted file mode 100644
index e793b9cb7e72..000000000000
--- a/drivers/block/paride/jumbo
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-#
-# This script can be used to build "jumbo" modules that contain the
-# base PARIDE support, one protocol module and one high-level driver.
-#
-echo -n "High level driver [pcd] : "
-read X
-HLD=${X:-pcd}
-#
-echo -n "Protocol module [bpck] : "
-read X
-PROTO=${X:-bpck}
-#
-echo -n "Use MODVERSIONS [y] ? "
-read X
-UMODV=${X:-y}
-#
-echo -n "For SMP kernel [n] ? "
-read X
-USMP=${X:-n}
-#
-echo -n "Support PARPORT [n] ? "
-read X
-UPARP=${X:-n}
-#
-echo
-#
-case $USMP in
-        y* | Y* ) FSMP="-DCONFIG_SMP"
-                  ;;
-        *)        FSMP=""
-                  ;;
-esac
-#
-MODI="-include ../../../include/linux/modversions.h"
-#
-case $UMODV in
-        y* | Y* ) FMODV="-DMODVERSIONS $MODI"
-                  ;;
-        *)        FMODV=""
-                  ;;
-esac
-#
-case $UPARP in
-        y* | Y* ) FPARP="-DCONFIG_PARPORT"
-                  ;;
-        *)        FPARP=""
-                  ;;
-esac
-#
-TARG=$HLD-$PROTO.o
-FPROTO=-DCONFIG_PARIDE_`echo "$PROTO" | tr [a-z] [A-Z]`
-FK="-D__KERNEL__ -I ../../../include"
-FLCH=-D_LINUX_CONFIG_H
-#
-echo cc $FK $FSMP $FLCH $FPARP $FPROTO $FMODV -Wall -O2 -o Jb.o -c paride.c
-cc $FK $FSMP $FLCH $FPARP $FPROTO $FMODV -Wall -O2 -o Jb.o -c paride.c
-#
-echo cc $FK $FSMP $FMODV -Wall -O2 -o Jp.o -c $PROTO.c
-cc $FK $FSMP $FMODV -Wall -O2 -o Jp.o -c $PROTO.c
-#
-echo cc $FK $FSMP $FMODV -DMODULE -DPARIDE_JUMBO -Wall -O2 -o Jd.o -c $HLD.c
-cc $FK $FSMP $FMODV -DMODULE -DPARIDE_JUMBO -Wall -O2 -o Jd.o -c $HLD.c
-#
-echo ld -r -o $TARG Jp.o Jb.o Jd.o
-ld -r -o $TARG Jp.o Jb.o Jd.o
-#
-#
-rm Jp.o Jb.o Jd.o
-#
diff --git a/drivers/block/paride/kbic.c b/drivers/block/paride/kbic.c
index d983bcea76fe..35999c415ee3 100644
--- a/drivers/block/paride/kbic.c
+++ b/drivers/block/paride/kbic.c
@@ -283,13 +283,21 @@ static struct pi_protocol k971 = {
 
 static int __init kbic_init(void)
 {
-        return (pi_register(&k951)||pi_register(&k971))-1;
+        int rv;
+
+        rv = paride_register(&k951);
+        if (rv < 0)
+                return rv;
+        rv = paride_register(&k971);
+        if (rv < 0)
+                paride_unregister(&k951);
+        return rv;
 }
 
 static void __exit kbic_exit(void)
 {
-        pi_unregister(&k951);
-        pi_unregister(&k971);
+        paride_unregister(&k951);
+        paride_unregister(&k971);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/ktti.c b/drivers/block/paride/ktti.c
index 6c7edbfba9a0..117ab0e8ccf0 100644
--- a/drivers/block/paride/ktti.c
+++ b/drivers/block/paride/ktti.c
@@ -115,12 +115,12 @@ static struct pi_protocol ktti = {
 
 static int __init ktti_init(void)
 {
-        return pi_register(&ktti)-1;
+        return paride_register(&ktti);
 }
 
 static void __exit ktti_exit(void)
 {
-        pi_unregister(&ktti);
+        paride_unregister(&ktti);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/on20.c b/drivers/block/paride/on20.c
index 9f8e01096809..0173697a1a4d 100644
--- a/drivers/block/paride/on20.c
+++ b/drivers/block/paride/on20.c
@@ -140,12 +140,12 @@ static struct pi_protocol on20 = {
 
 static int __init on20_init(void)
 {
-        return pi_register(&on20)-1;
+        return paride_register(&on20);
 }
 
 static void __exit on20_exit(void)
 {
-        pi_unregister(&on20);
+        paride_unregister(&on20);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/on26.c b/drivers/block/paride/on26.c
index 0f833caa2101..95ba256921f2 100644
--- a/drivers/block/paride/on26.c
+++ b/drivers/block/paride/on26.c
@@ -306,12 +306,12 @@ static struct pi_protocol on26 = {
 
 static int __init on26_init(void)
 {
-        return pi_register(&on26)-1;
+        return paride_register(&on26);
 }
 
 static void __exit on26_exit(void)
 {
-        pi_unregister(&on26);
+        paride_unregister(&on26);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/block/paride/paride.c b/drivers/block/paride/paride.c
index 4b258f7836f3..48c50f11f63b 100644
--- a/drivers/block/paride/paride.c
+++ b/drivers/block/paride/paride.c
@@ -29,14 +29,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/sched.h>        /* TASK_* */
-
-#ifdef CONFIG_PARPORT_MODULE
-#define CONFIG_PARPORT
-#endif
-
-#ifdef CONFIG_PARPORT
 #include <linux/parport.h>
-#endif
 
 #include "paride.h"
 
@@ -76,8 +69,6 @@ void pi_read_block(PIA * pi, char *buf, int count)
 
 EXPORT_SYMBOL(pi_read_block);
 
-#ifdef CONFIG_PARPORT
-
 static void pi_wake_up(void *p)
 {
         PIA *pi = (PIA *) p;
@@ -100,11 +91,8 @@ static void pi_wake_up(void *p)
                 cont();
 }
 
-#endif
-
 int pi_schedule_claimed(PIA * pi, void (*cont) (void))
 {
-#ifdef CONFIG_PARPORT
         unsigned long flags;
 
         spin_lock_irqsave(&pi_spinlock, flags);
@@ -115,7 +103,6 @@ int pi_schedule_claimed(PIA * pi, void (*cont) (void))
         }
         pi->claimed = 1;
         spin_unlock_irqrestore(&pi_spinlock, flags);
-#endif
         return 1;
 }
 EXPORT_SYMBOL(pi_schedule_claimed);
@@ -133,20 +120,16 @@ static void pi_claim(PIA * pi)
         if (pi->claimed)
                 return;
         pi->claimed = 1;
-#ifdef CONFIG_PARPORT
         if (pi->pardev)
                 wait_event(pi->parq,
                            !parport_claim((struct pardevice *) pi->pardev));
-#endif
 }
 
 static void pi_unclaim(PIA * pi)
 {
         pi->claimed = 0;
-#ifdef CONFIG_PARPORT
         if (pi->pardev)
                 parport_release((struct pardevice *) (pi->pardev));
-#endif
 }
 
 void pi_connect(PIA * pi)
@@ -167,21 +150,15 @@ EXPORT_SYMBOL(pi_disconnect);
 
 static void pi_unregister_parport(PIA * pi)
 {
-#ifdef CONFIG_PARPORT
         if (pi->pardev) {
                 parport_unregister_device((struct pardevice *) (pi->pardev));
                 pi->pardev = NULL;
         }
-#endif
 }
 
 void pi_release(PIA * pi)
 {
         pi_unregister_parport(pi);
-#ifndef CONFIG_PARPORT
-        if (pi->reserved)
-                release_region(pi->port, pi->reserved);
-#endif                          /* !CONFIG_PARPORT */
         if (pi->proto->release_proto)
                 pi->proto->release_proto(pi);
         module_put(pi->proto->owner);
@@ -229,7 +206,7 @@ static int pi_test_proto(PIA * pi, char *scratch, int verbose)
         return res;
 }
 
-int pi_register(PIP * pr)
+int paride_register(PIP * pr)
 {
         int k;
 
@@ -237,24 +214,24 @@ int pi_register(PIP * pr)
                 if (protocols[k] && !strcmp(pr->name, protocols[k]->name)) {
                         printk("paride: %s protocol already registered\n",
                                pr->name);
-                        return 0;
+                        return -1;
                 }
         k = 0;
         while ((k < MAX_PROTOS) && (protocols[k]))
                 k++;
         if (k == MAX_PROTOS) {
                 printk("paride: protocol table full\n");
-                return 0;
+                return -1;
         }
         protocols[k] = pr;
         pr->index = k;
         printk("paride: %s registered as protocol %d\n", pr->name, k);
-        return 1;
+        return 0;
 }
 
-EXPORT_SYMBOL(pi_register);
+EXPORT_SYMBOL(paride_register);
 
-void pi_unregister(PIP * pr)
+void paride_unregister(PIP * pr)
 {
         if (!pr)
                 return;
@@ -265,12 +242,10 @@ void pi_unregister(PIP * pr)
         protocols[pr->index] = NULL;
 }
 
-EXPORT_SYMBOL(pi_unregister);
+EXPORT_SYMBOL(paride_unregister);
 
 static int pi_register_parport(PIA * pi, int verbose)
 {
-#ifdef CONFIG_PARPORT
-
         struct parport *port;
 
         port = parport_find_base(pi->port);
@@ -290,7 +265,6 @@ static int pi_register_parport(PIA * pi, int verbose)
                 printk("%s: 0x%x is %s\n", pi->device, pi->port, port->name);
 
         pi->parname = (char *) port->name;
-#endif
 
         return 1;
 }
@@ -447,13 +421,6 @@ int pi_init(PIA * pi, int autoprobe, int port, int mode,
                         printk("%s: Adapter not found\n", device);
                 return 0;
         }
-#ifndef CONFIG_PARPORT
-        if (!request_region(pi->port, pi->reserved, pi->device)) {
-                printk(KERN_WARNING "paride: Unable to request region 0x%x\n",
-                       pi->port);
-                return 0;
-        }
-#endif                          /* !CONFIG_PARPORT */
 
         if (pi->parname)
                 printk("%s: Sharing %s at 0x%x\n", pi->device,
diff --git a/drivers/block/paride/paride.h b/drivers/block/paride/paride.h
index c6d98ef09e48..2bddbf45518b 100644
--- a/drivers/block/paride/paride.h
+++ b/drivers/block/paride/paride.h
@@ -163,8 +163,8 @@ struct pi_protocol {
 
 typedef struct pi_protocol PIP;
 
-extern int pi_register( PIP * );
-extern void pi_unregister ( PIP * );
+extern int paride_register( PIP * );
+extern void paride_unregister ( PIP * );
 
 #endif /* __DRIVERS_PARIDE_H__ */
 /* end of paride.h */
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index ac5ba462710b..c852eed91e4b 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -912,12 +912,12 @@ static int __init pcd_init(void)
         int unit;
 
         if (disable)
-                return -1;
+                return -EINVAL;
 
         pcd_init_units();
 
         if (pcd_detect())
-                return -1;
+                return -ENODEV;
 
         /* get the atapi capabilities page */
         pcd_probe_capabilities();
@@ -925,7 +925,7 @@ static int __init pcd_init(void)
         if (register_blkdev(major, name)) {
                 for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++)
                         put_disk(cd->disk);
-                return -1;
+                return -EBUSY;
         }
 
         pcd_queue = blk_init_queue(do_pcd_request, &pcd_lock);
@@ -933,7 +933,7 @@ static int __init pcd_init(void)
                 unregister_blkdev(major, name);
                 for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++)
                         put_disk(cd->disk);
-                return -1;
+                return -ENOMEM;
         }
 
         for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++) {
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 1a9dee19efcf..7cdaa1951260 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -933,25 +933,25 @@ static int __init pf_init(void)
         int unit;
 
         if (disable)
-                return -1;
+                return -EINVAL;
 
         pf_init_units();
 
         if (pf_detect())
-                return -1;
+                return -ENODEV;
         pf_busy = 0;
 
         if (register_blkdev(major, name)) {
                 for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++)
                         put_disk(pf->disk);
-                return -1;
+                return -EBUSY;
         }
         pf_queue = blk_init_queue(do_pf_request, &pf_spin_lock);
         if (!pf_queue) {
                 unregister_blkdev(major, name);
                 for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++)
                         put_disk(pf->disk);
-                return -1;
+                return -ENOMEM;
         }
 
         blk_queue_max_phys_segments(pf_queue, cluster);
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 13f998aa1cd3..9970aedbb5d9 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -646,14 +646,14 @@ static int __init pg_init(void)
         int err;
 
         if (disable){
-                err = -1;
+                err = -EINVAL;
                 goto out;
         }
 
         pg_init_units();
 
         if (pg_detect()) {
-                err = -1;
+                err = -ENODEV;
                 goto out;
         }
 
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 35fb26636721..c902b25e4869 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -946,12 +946,12 @@ static int __init pt_init(void)
         int err;
 
         if (disable) {
-                err = -1;
+                err = -EINVAL;
                 goto out;
         }
 
         if (pt_detect()) {
-                err = -1;
+                err = -ENODEV;
                 goto out;
         }
 
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index f2904f67af47..e45eaa264119 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -54,7 +54,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/miscdevice.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/mutex.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_ioctl.h>