[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, 37 insertions, 37 deletions

diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c
index 27014b9de126..2b11a4272364 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c
@@ -752,7 +752,7 @@ ahc_pci_config(struct ahc_softc *ahc, const struct ahc_pci_identity *entry)
         if ((ahc->flags & AHC_39BIT_ADDRESSING) != 0) {
 
                 if (bootverbose)
-                        printf("%s: Enabling 39Bit Addressing\n",
+                        printk("%s: Enabling 39Bit Addressing\n",
                                ahc_name(ahc));
                 devconfig |= DACEN;
         }
@@ -896,7 +896,7 @@ ahc_pci_config(struct ahc_softc *ahc, const struct ahc_pci_identity *entry)
                 /* See if someone else set us up already */
                 if ((ahc->flags & AHC_NO_BIOS_INIT) == 0
                  && scsiseq != 0) {
-                        printf("%s: Using left over BIOS settings\n",
+                        printk("%s: Using left over BIOS settings\n",
                                 ahc_name(ahc));
                         ahc->flags &= ~AHC_USEDEFAULTS;
                         ahc->flags |= AHC_BIOS_ENABLED;
@@ -1155,7 +1155,7 @@ done:
         ahc_outb(ahc, CLRINT, CLRPARERR);
         ahc_outb(ahc, CLRINT, CLRBRKADRINT);
         if (bootverbose && enable) {
-                printf("%s: External SRAM, %s access%s, %dbytes/SCB\n",
+                printk("%s: External SRAM, %s access%s, %dbytes/SCB\n",
                        ahc_name(ahc), fast ? "fast" : "slow", 
                        pcheck ? ", parity checking enabled" : "",
                        large ? 64 : 32);
@@ -1292,7 +1292,7 @@ check_extport(struct ahc_softc *ahc, u_int *sxfrctl1)
         if (have_seeprom) {
 
                 if (bootverbose) 
-                        printf("%s: Reading SEEPROM...", ahc_name(ahc));
+                        printk("%s: Reading SEEPROM...", ahc_name(ahc));
 
                 for (;;) {
                         u_int start_addr;
@@ -1309,9 +1309,9 @@ check_extport(struct ahc_softc *ahc, u_int *sxfrctl1)
                         if (have_seeprom != 0 || sd.sd_chip == C56_66) {
                                 if (bootverbose) {
                                         if (have_seeprom == 0)
-                                                printf ("checksum error\n");
+                                                printk ("checksum error\n");
                                         else
-                                                printf ("done.\n");
+                                                printk ("done.\n");
                                 }
                                 break;
                         }
@@ -1362,9 +1362,9 @@ check_extport(struct ahc_softc *ahc, u_int *sxfrctl1)
 
         if (!have_seeprom) {
                 if (bootverbose)
-                        printf("%s: No SEEPROM available.\n", ahc_name(ahc));
+                        printk("%s: No SEEPROM available.\n", ahc_name(ahc));
                 ahc->flags |= AHC_USEDEFAULTS;
-                free(ahc->seep_config, M_DEVBUF);
+                kfree(ahc->seep_config);
                 ahc->seep_config = NULL;
                 sc = NULL;
         } else {
@@ -1399,7 +1399,7 @@ check_extport(struct ahc_softc *ahc, u_int *sxfrctl1)
                 if ((sc->adapter_control & CFSTERM) != 0)
                         *sxfrctl1 |= STPWEN;
                 if (bootverbose)
-                        printf("%s: Low byte termination %sabled\n",
+                        printk("%s: Low byte termination %sabled\n",
                                ahc_name(ahc),
                                (*sxfrctl1 & STPWEN) ? "en" : "dis");
         }
@@ -1569,7 +1569,7 @@ configure_termination(struct ahc_softc *ahc,
                                             &eeprom_present);
                         if ((adapter_control & CFSEAUTOTERM) == 0) {
                                 if (bootverbose)
-                                        printf("%s: Manual SE Termination\n",
+                                        printk("%s: Manual SE Termination\n",
                                                ahc_name(ahc));
                                 enableSEC_low = (adapter_control & CFSELOWTERM);
                                 enableSEC_high =
@@ -1577,7 +1577,7 @@ configure_termination(struct ahc_softc *ahc,
                         }
                         if ((adapter_control & CFAUTOTERM) == 0) {
                                 if (bootverbose)
-                                        printf("%s: Manual LVD Termination\n",
+                                        printk("%s: Manual LVD Termination\n",
                                                ahc_name(ahc));
                                 enablePRI_low = (adapter_control & CFSTERM);
                                 enablePRI_high = (adapter_control & CFWSTERM);
@@ -1604,19 +1604,19 @@ configure_termination(struct ahc_softc *ahc,
 
                 if (bootverbose
                  && (ahc->features & AHC_ULTRA2) == 0) {
-                        printf("%s: internal 50 cable %s present",
+                        printk("%s: internal 50 cable %s present",
                                ahc_name(ahc),
                                internal50_present ? "is":"not");
 
                         if ((ahc->features & AHC_WIDE) != 0)
-                                printf(", internal 68 cable %s present",
+                                printk(", internal 68 cable %s present",
                                        internal68_present ? "is":"not");
-                        printf("\n%s: external cable %s present\n",
+                        printk("\n%s: external cable %s present\n",
                                ahc_name(ahc),
                                externalcable_present ? "is":"not");
                 }
                 if (bootverbose)
-                        printf("%s: BIOS eeprom %s present\n",
+                        printk("%s: BIOS eeprom %s present\n",
                                ahc_name(ahc), eeprom_present ? "is" : "not");
 
                 if ((ahc->flags & AHC_INT50_SPEEDFLEX) != 0) {
@@ -1642,7 +1642,7 @@ configure_termination(struct ahc_softc *ahc,
                  && (internal50_present != 0)
                  && (internal68_present != 0)
                  && (externalcable_present != 0)) {
-                        printf("%s: Illegal cable configuration!!. "
+                        printk("%s: Illegal cable configuration!!. "
                                "Only two connectors on the "
                                "adapter may be used at a "
                                "time!\n", ahc_name(ahc));
@@ -1664,10 +1664,10 @@ configure_termination(struct ahc_softc *ahc,
                         brddat |= BRDDAT6;
                         if (bootverbose) {
                                 if ((ahc->flags & AHC_INT50_SPEEDFLEX) != 0)
-                                        printf("%s: 68 pin termination "
+                                        printk("%s: 68 pin termination "
                                                "Enabled\n", ahc_name(ahc));
                                 else
-                                        printf("%s: %sHigh byte termination "
+                                        printk("%s: %sHigh byte termination "
                                                "Enabled\n", ahc_name(ahc),
                                                enableSEC_high ? "Secondary "
                                                               : "");
@@ -1683,10 +1683,10 @@ configure_termination(struct ahc_softc *ahc,
                                 *sxfrctl1 |= STPWEN;
                         if (bootverbose) {
                                 if ((ahc->flags & AHC_INT50_SPEEDFLEX) != 0)
-                                        printf("%s: 50 pin termination "
+                                        printk("%s: 50 pin termination "
                                                "Enabled\n", ahc_name(ahc));
                                 else
-                                        printf("%s: %sLow byte termination "
+                                        printk("%s: %sLow byte termination "
                                                "Enabled\n", ahc_name(ahc),
                                                enableSEC_low ? "Secondary "
                                                              : "");
@@ -1696,7 +1696,7 @@ configure_termination(struct ahc_softc *ahc,
                 if (enablePRI_low != 0) {
                         *sxfrctl1 |= STPWEN;
                         if (bootverbose)
-                                printf("%s: Primary Low Byte termination "
+                                printk("%s: Primary Low Byte termination "
                                        "Enabled\n", ahc_name(ahc));
                 }
 
@@ -1709,7 +1709,7 @@ configure_termination(struct ahc_softc *ahc,
                 if (enablePRI_high != 0) {
                         brddat |= BRDDAT4;
                         if (bootverbose)
-                                printf("%s: Primary High Byte "
+                                printk("%s: Primary High Byte "
                                        "termination Enabled\n",
                                        ahc_name(ahc));
                 }
@@ -1721,7 +1721,7 @@ configure_termination(struct ahc_softc *ahc,
                         *sxfrctl1 |= STPWEN;
 
                         if (bootverbose)
-                                printf("%s: %sLow byte termination Enabled\n",
+                                printk("%s: %sLow byte termination Enabled\n",
                                        ahc_name(ahc),
                                        (ahc->features & AHC_ULTRA2) ? "Primary "
                                                                     : "");
@@ -1731,7 +1731,7 @@ configure_termination(struct ahc_softc *ahc,
                  && (ahc->features & AHC_WIDE) != 0) {
                         brddat |= BRDDAT6;
                         if (bootverbose)
-                                printf("%s: %sHigh byte termination Enabled\n",
+                                printk("%s: %sHigh byte termination Enabled\n",
                                        ahc_name(ahc),
                                        (ahc->features & AHC_ULTRA2)
                                      ? "Secondary " : "");
@@ -1937,29 +1937,29 @@ ahc_pci_intr(struct ahc_softc *ahc)
         status1 = ahc_pci_read_config(ahc->dev_softc,
                                       PCIR_STATUS + 1, /*bytes*/1);
 
-        printf("%s: PCI error Interrupt at seqaddr = 0x%x\n",
+        printk("%s: PCI error Interrupt at seqaddr = 0x%x\n",
               ahc_name(ahc),
               ahc_inb(ahc, SEQADDR0) | (ahc_inb(ahc, SEQADDR1) << 8));
 
         if (status1 & DPE) {
                 ahc->pci_target_perr_count++;
-                printf("%s: Data Parity Error Detected during address "
+                printk("%s: Data Parity Error Detected during address "
                        "or write data phase\n", ahc_name(ahc));
         }
         if (status1 & SSE) {
-                printf("%s: Signal System Error Detected\n", ahc_name(ahc));
+                printk("%s: Signal System Error Detected\n", ahc_name(ahc));
         }
         if (status1 & RMA) {
-                printf("%s: Received a Master Abort\n", ahc_name(ahc));
+                printk("%s: Received a Master Abort\n", ahc_name(ahc));
         }
         if (status1 & RTA) {
-                printf("%s: Received a Target Abort\n", ahc_name(ahc));
+                printk("%s: Received a Target Abort\n", ahc_name(ahc));
         }
         if (status1 & STA) {
-                printf("%s: Signaled a Target Abort\n", ahc_name(ahc));
+                printk("%s: Signaled a Target Abort\n", ahc_name(ahc));
         }
         if (status1 & DPR) {
-                printf("%s: Data Parity Error has been reported via PERR#\n",
+                printk("%s: Data Parity Error has been reported via PERR#\n",
                        ahc_name(ahc));
         }
 
@@ -1968,14 +1968,14 @@ ahc_pci_intr(struct ahc_softc *ahc)
                              status1, /*bytes*/1);
 
         if ((status1 & (DPE|SSE|RMA|RTA|STA|DPR)) == 0) {
-                printf("%s: Latched PCIERR interrupt with "
+                printk("%s: Latched PCIERR interrupt with "
                        "no status bits set\n", ahc_name(ahc)); 
         } else {
                 ahc_outb(ahc, CLRINT, CLRPARERR);
         }
 
         if (ahc->pci_target_perr_count > AHC_PCI_TARGET_PERR_THRESH) {
-                printf(
+                printk(
 "%s: WARNING WARNING WARNING WARNING\n"
 "%s: Too many PCI parity errors observed as a target.\n"
 "%s: Some device on this bus is generating bad parity.\n"
@@ -2386,7 +2386,7 @@ ahc_aha29160C_setup(struct ahc_softc *ahc)
 static int
 ahc_raid_setup(struct ahc_softc *ahc)
 {
-        printf("RAID functionality unsupported\n");
+        printk("RAID functionality unsupported\n");
         return (ENXIO);
 }
 
@@ -2404,7 +2404,7 @@ ahc_aha394XX_setup(struct ahc_softc *ahc)
                 ahc->channel = 'B';
                 break;
         default:
-                printf("adapter at unexpected slot %d\n"
+                printk("adapter at unexpected slot %d\n"
                        "unable to map to a channel\n",
                        ahc_get_pci_slot(pci));
                 ahc->channel = 'A';
@@ -2429,7 +2429,7 @@ ahc_aha398XX_setup(struct ahc_softc *ahc)
                 ahc->channel = 'C';
                 break;
         default:
-                printf("adapter at unexpected slot %d\n"
+                printk("adapter at unexpected slot %d\n"
                        "unable to map to a channel\n",
                        ahc_get_pci_slot(pci));
                 ahc->channel = 'A';
@@ -2459,7 +2459,7 @@ ahc_aha494XX_setup(struct ahc_softc *ahc)
                 ahc->channel = 'D';
                 break;
         default:
-                printf("adapter at unexpected slot %d\n"
+                printk("adapter at unexpected slot %d\n"
                        "unable to map to a channel\n",
                        ahc_get_pci_slot(pci));
                 ahc->channel = 'A';