[SCSI] aic7xxx: Remove OS utility wrappers

This patch removes malloc(), free(), and printf() wrappers from the aic7xxx
SCSI driver. I didn't use pr_debug for printf because of some 'clever' uses of
printf don't compile with the pr_debug. I didn't fix the overeager uses of
GFP_ATOMIC either because I wanted to keep this patch as simple as possible.

[jejb:fixed up checkpatch errors and fixed up missed conversion]
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 78fc70c24e07..ee05e8410754 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -225,7 +225,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 ahc_get_pci_bus(pci),
                 ahc_get_pci_slot(pci),
                 ahc_get_pci_function(pci));
-        name = malloc(strlen(buf) + 1, M_DEVBUF, M_NOWAIT);
+        name = kmalloc(strlen(buf) + 1, GFP_ATOMIC);
         if (name == NULL)
                 return (-ENOMEM);
         strcpy(name, buf);
@@ -412,7 +412,7 @@ ahc_pci_map_registers(struct ahc_softc *ahc)
                  */
                 if (ahc_pci_test_register_access(ahc) != 0) {
 
-                        printf("aic7xxx: PCI Device %d:%d:%d "
+                        printk("aic7xxx: PCI Device %d:%d:%d "
                                "failed memory mapped test.  Using PIO.\n",
                                ahc_get_pci_bus(ahc->dev_softc),
                                ahc_get_pci_slot(ahc->dev_softc),
@@ -425,7 +425,7 @@ ahc_pci_map_registers(struct ahc_softc *ahc)
                 } else
                         command |= PCIM_CMD_MEMEN;
         } else {
-                printf("aic7xxx: PCI%d:%d:%d MEM region 0x%llx "
+                printk("aic7xxx: PCI%d:%d:%d MEM region 0x%llx "
                        "unavailable. Cannot memory map device.\n",
                        ahc_get_pci_bus(ahc->dev_softc),
                        ahc_get_pci_slot(ahc->dev_softc),
@@ -444,7 +444,7 @@ ahc_pci_map_registers(struct ahc_softc *ahc)
                         ahc->bsh.ioport = (u_long)base;
                         command |= PCIM_CMD_PORTEN;
                 } else {
-                        printf("aic7xxx: PCI%d:%d:%d IO region 0x%llx[0..255] "
+                        printk("aic7xxx: PCI%d:%d:%d IO region 0x%llx[0..255] "
                                "unavailable. Cannot map device.\n",
                                ahc_get_pci_bus(ahc->dev_softc),
                                ahc_get_pci_slot(ahc->dev_softc),