[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>
This commit is contained in:

committed by
James Bottomley

parent
660bdddb52
commit
48813cf989
@@ -178,7 +178,7 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
ahd_get_pci_bus(pci),
|
||||
ahd_get_pci_slot(pci),
|
||||
ahd_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);
|
||||
@@ -333,7 +333,7 @@ ahd_pci_map_registers(struct ahd_softc *ahd)
|
||||
|
||||
if (ahd_pci_test_register_access(ahd) != 0) {
|
||||
|
||||
printf("aic79xx: PCI Device %d:%d:%d "
|
||||
printk("aic79xx: PCI Device %d:%d:%d "
|
||||
"failed memory mapped test. Using PIO.\n",
|
||||
ahd_get_pci_bus(ahd->dev_softc),
|
||||
ahd_get_pci_slot(ahd->dev_softc),
|
||||
@@ -346,7 +346,7 @@ ahd_pci_map_registers(struct ahd_softc *ahd)
|
||||
} else
|
||||
command |= PCIM_CMD_MEMEN;
|
||||
} else if (bootverbose) {
|
||||
printf("aic79xx: PCI%d:%d:%d MEM region 0x%llx "
|
||||
printk("aic79xx: PCI%d:%d:%d MEM region 0x%llx "
|
||||
"unavailable. Cannot memory map device.\n",
|
||||
ahd_get_pci_bus(ahd->dev_softc),
|
||||
ahd_get_pci_slot(ahd->dev_softc),
|
||||
@@ -365,7 +365,7 @@ ahd_pci_map_registers(struct ahd_softc *ahd)
|
||||
ahd->bshs[1].ioport = (u_long)base2;
|
||||
command |= PCIM_CMD_PORTEN;
|
||||
} else {
|
||||
printf("aic79xx: PCI%d:%d:%d IO regions 0x%llx and "
|
||||
printk("aic79xx: PCI%d:%d:%d IO regions 0x%llx and "
|
||||
"0x%llx unavailable. Cannot map device.\n",
|
||||
ahd_get_pci_bus(ahd->dev_softc),
|
||||
ahd_get_pci_slot(ahd->dev_softc),
|
||||
|
Reference in New Issue
Block a user