[SCSI] aic7xxx: Remove OS utility wrappers

[pandora-kernel.git] / drivers / scsi / aic7xxx / aic79xx_pci.c

diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index 90a04a3..14b5f8d 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -338,7 +338,7 @@ ahd_pci_config(struct ahd_softc *ahd, const struct ahd_pci_identity *entry)
         */
        if ((ahd->flags & (AHD_39BIT_ADDRESSING|AHD_64BIT_ADDRESSING)) != 0) {
                if (bootverbose)
-                       printf("%s: Enabling 39Bit Addressing\n",
+                       printk("%s: Enabling 39Bit Addressing\n",
                               ahd_name(ahd));
                devconfig = ahd_pci_read_config(ahd->dev_softc,
                                                DEVCONFIG, /*bytes*/4);
@@ -528,7 +528,7 @@ ahd_check_extport(struct ahd_softc *ahd)
                 * Fetch VPD for this function and parse it.
                 */
                if (bootverbose) 
-                       printf("%s: Reading VPD from SEEPROM...",
+                       printk("%s: Reading VPD from SEEPROM...",
                               ahd_name(ahd));
 
                /* Address is always in units of 16bit words */
@@ -541,12 +541,12 @@ ahd_check_extport(struct ahd_softc *ahd)
                if (error == 0)
                        error = ahd_parse_vpddata(ahd, &vpd);
                if (bootverbose) 
-                       printf("%s: VPD parsing %s\n",
+                       printk("%s: VPD parsing %s\n",
                               ahd_name(ahd),
                               error == 0 ? "successful" : "failed");
 
                if (bootverbose) 
-                       printf("%s: Reading SEEPROM...", ahd_name(ahd));
+                       printk("%s: Reading SEEPROM...", ahd_name(ahd));
 
                /* Address is always in units of 16bit words */
                start_addr = (sizeof(*sc) / 2) * (ahd->channel - 'A');
@@ -556,16 +556,16 @@ ahd_check_extport(struct ahd_softc *ahd)
                                         /*bytestream*/FALSE);
 
                if (error != 0) {
-                       printf("Unable to read SEEPROM\n");
+                       printk("Unable to read SEEPROM\n");
                        have_seeprom = 0;
                } else {
                        have_seeprom = ahd_verify_cksum(sc);
 
                        if (bootverbose) {
                                if (have_seeprom == 0)
-                                       printf ("checksum error\n");
+                                       printk ("checksum error\n");
                                else
-                                       printf ("done.\n");
+                                       printk ("done.\n");
                        }
                }
                ahd_release_seeprom(ahd);
@@ -615,21 +615,21 @@ ahd_check_extport(struct ahd_softc *ahd)
                uint16_t *sc_data;
                int       i;
 
-               printf("%s: Seeprom Contents:", ahd_name(ahd));
+               printk("%s: Seeprom Contents:", ahd_name(ahd));
                sc_data = (uint16_t *)sc;
                for (i = 0; i < (sizeof(*sc)); i += 2)
-                       printf("\n\t0x%.4x", sc_data[i]);
-               printf("\n");
+                       printk("\n\t0x%.4x", sc_data[i]);
+               printk("\n");
        }
 #endif
 
        if (!have_seeprom) {
                if (bootverbose)
-                       printf("%s: No SEEPROM available.\n", ahd_name(ahd));
+                       printk("%s: No SEEPROM available.\n", ahd_name(ahd));
                ahd->flags |= AHD_USEDEFAULTS;
                error = ahd_default_config(ahd);
                adapter_control = CFAUTOTERM|CFSEAUTOTERM;
-               free(ahd->seep_config, M_DEVBUF);
+               kfree(ahd->seep_config);
                ahd->seep_config = NULL;
        } else {
                error = ahd_parse_cfgdata(ahd, sc);
@@ -656,7 +656,7 @@ ahd_configure_termination(struct ahd_softc *ahd, u_int adapter_control)
        if ((ahd->flags & AHD_STPWLEVEL_A) != 0)
                devconfig |= STPWLEVEL;
        if (bootverbose)
-               printf("%s: STPWLEVEL is %s\n",
+               printk("%s: STPWLEVEL is %s\n",
                       ahd_name(ahd), (devconfig & STPWLEVEL) ? "on" : "off");
        ahd_pci_write_config(ahd->dev_softc, DEVCONFIG, devconfig, /*bytes*/4);
  
@@ -671,7 +671,7 @@ ahd_configure_termination(struct ahd_softc *ahd, u_int adapter_control)
        error = ahd_read_flexport(ahd, FLXADDR_TERMCTL, &termctl);
        if ((adapter_control & CFAUTOTERM) == 0) {
                if (bootverbose)
-                       printf("%s: Manual Primary Termination\n",
+                       printk("%s: Manual Primary Termination\n",
                               ahd_name(ahd));
                termctl &= ~(FLX_TERMCTL_ENPRILOW|FLX_TERMCTL_ENPRIHIGH);
                if ((adapter_control & CFSTERM) != 0)
@@ -679,14 +679,14 @@ ahd_configure_termination(struct ahd_softc *ahd, u_int adapter_control)
                if ((adapter_control & CFWSTERM) != 0)
                        termctl |= FLX_TERMCTL_ENPRIHIGH;
        } else if (error != 0) {
-               printf("%s: Primary Auto-Term Sensing failed! "
+               printk("%s: Primary Auto-Term Sensing failed! "
                       "Using Defaults.\n", ahd_name(ahd));
                termctl = FLX_TERMCTL_ENPRILOW|FLX_TERMCTL_ENPRIHIGH;
        }
 
        if ((adapter_control & CFSEAUTOTERM) == 0) {
                if (bootverbose)
-                       printf("%s: Manual Secondary Termination\n",
+                       printk("%s: Manual Secondary Termination\n",
                               ahd_name(ahd));
                termctl &= ~(FLX_TERMCTL_ENSECLOW|FLX_TERMCTL_ENSECHIGH);
                if ((adapter_control & CFSELOWTERM) != 0)
@@ -694,7 +694,7 @@ ahd_configure_termination(struct ahd_softc *ahd, u_int adapter_control)
                if ((adapter_control & CFSEHIGHTERM) != 0)
                        termctl |= FLX_TERMCTL_ENSECHIGH;
        } else if (error != 0) {
-               printf("%s: Secondary Auto-Term Sensing failed! "
+               printk("%s: Secondary Auto-Term Sensing failed! "
                       "Using Defaults.\n", ahd_name(ahd));
                termctl |= FLX_TERMCTL_ENSECLOW|FLX_TERMCTL_ENSECHIGH;
        }
@@ -714,22 +714,22 @@ ahd_configure_termination(struct ahd_softc *ahd, u_int adapter_control)
 
        error = ahd_write_flexport(ahd, FLXADDR_TERMCTL, termctl);
        if (error != 0) {
-               printf("%s: Unable to set termination settings!\n",
+               printk("%s: Unable to set termination settings!\n",
                       ahd_name(ahd));
        } else if (bootverbose) {
-               printf("%s: Primary High byte termination %sabled\n",
+               printk("%s: Primary High byte termination %sabled\n",
                       ahd_name(ahd),
                       (termctl & FLX_TERMCTL_ENPRIHIGH) ? "En" : "Dis");
 
-               printf("%s: Primary Low byte termination %sabled\n",
+               printk("%s: Primary Low byte termination %sabled\n",
                       ahd_name(ahd),
                       (termctl & FLX_TERMCTL_ENPRILOW) ? "En" : "Dis");
 
-               printf("%s: Secondary High byte termination %sabled\n",
+               printk("%s: Secondary High byte termination %sabled\n",
                       ahd_name(ahd),
                       (termctl & FLX_TERMCTL_ENSECHIGH) ? "En" : "Dis");
 
-               printf("%s: Secondary Low byte termination %sabled\n",
+               printk("%s: Secondary Low byte termination %sabled\n",
                       ahd_name(ahd),
                       (termctl & FLX_TERMCTL_ENSECLOW) ? "En" : "Dis");
        }
@@ -805,7 +805,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
        if ((intstat & PCIINT) == 0)
                return;
 
-       printf("%s: PCI error Interrupt\n", ahd_name(ahd));
+       printk("%s: PCI error Interrupt\n", ahd_name(ahd));
        saved_modes = ahd_save_modes(ahd);
        ahd_dump_card_state(ahd);
        ahd_set_modes(ahd, AHD_MODE_CFG, AHD_MODE_CFG);
@@ -832,7 +832,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
                                s = pci_status_strings[bit];
                                if (i == 7/*TARG*/ && bit == 3)
                                        s = "%s: Signaled Target Abort\n";
-                               printf(s, ahd_name(ahd), pci_status_source[i]);
+                               printk(s, ahd_name(ahd), pci_status_source[i]);
                        }
                }       
        }
@@ -862,7 +862,7 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
         */
        pcix_status = ahd_pci_read_config(ahd->dev_softc, PCIXR_STATUS,
                                          /*bytes*/2);
-       printf("%s: PCI Split Interrupt - PCI-X status = 0x%x\n",
+       printk("%s: PCI Split Interrupt - PCI-X status = 0x%x\n",
               ahd_name(ahd), pcix_status);
        saved_modes = ahd_save_modes(ahd);
        for (i = 0; i < 4; i++) {
@@ -891,7 +891,7 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
                                static const char *s;
 
                                s = split_status_strings[bit];
-                               printf(s, ahd_name(ahd),
+                               printk(s, ahd_name(ahd),
                                       split_status_source[i]);
                        }
 
@@ -902,7 +902,7 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
                                static const char *s;
 
                                s = split_status_strings[bit];
-                               printf(s, ahd_name(ahd), "SG");
+                               printk(s, ahd_name(ahd), "SG");
                        }
                }
        }
@@ -950,7 +950,7 @@ ahd_aic790X_setup(struct ahd_softc *ahd)
        pci = ahd->dev_softc;
        rev = ahd_pci_read_config(pci, PCIR_REVID, /*bytes*/1);
        if (rev < ID_AIC7902_PCI_REV_A4) {
-               printf("%s: Unable to attach to unsupported chip revision %d\n",
+               printk("%s: Unable to attach to unsupported chip revision %d\n",
                       ahd_name(ahd), rev);
                ahd_pci_write_config(pci, PCIR_COMMAND, 0, /*bytes*/2);
                return (ENXIO);