The patch titled
CCISS: announce cciss%d devices with PCI address/IRQ/DAC info
has been removed from the -mm tree. Its filename is
cciss-announce-cciss%d-devices-with-pci-address-irq-dac-info.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: CCISS: announce cciss%d devices with PCI address/IRQ/DAC info
From: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
We already print "cciss: using DAC cycles" or similar for every adapter found:
why not just identify the device we're talking about and include other useful
information?
Jeff Garzik <jeff@xxxxxxxxxx>:
Although this patch is correct, I would consider using dev_printk() rather
than referencing pci_name() in printk() arguments.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Acked-by: Mike Miller <mike.miller@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/block/cciss.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff -puN drivers/block/cciss.c~cciss-announce-cciss%d-devices-with-pci-address-irq-dac-info drivers/block/cciss.c
--- a/drivers/block/cciss.c~cciss-announce-cciss%d-devices-with-pci-address-irq-dac-info
+++ a/drivers/block/cciss.c
@@ -3086,11 +3086,8 @@ static int __devinit cciss_init_one(stru
int i;
int j;
int rc;
+ int dac;
- printk(KERN_DEBUG "cciss: Device 0x%x has been found at"
- " bus %d dev %d func %d\n",
- pdev->device, pdev->bus->number, PCI_SLOT(pdev->devfn),
- PCI_FUNC(pdev->devfn));
i = alloc_cciss_hba();
if(i < 0)
return (-1);
@@ -3106,11 +3103,11 @@ static int __devinit cciss_init_one(stru
/* configure PCI DMA stuff */
if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK))
- printk("cciss: using DAC cycles\n");
+ dac = 1;
else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK))
- printk("cciss: not using DAC cycles\n");
+ dac = 0;
else {
- printk("cciss: no suitable DMA available\n");
+ printk(KERN_ERR "cciss: no suitable DMA available\n");
goto clean1;
}
@@ -3141,6 +3138,11 @@ static int __devinit cciss_init_one(stru
hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname);
goto clean2;
}
+
+ printk(KERN_INFO "%s: <0x%x> at PCI %s IRQ %d%s using DAC\n",
+ hba[i]->devname, pdev->device, pci_name(pdev),
+ hba[i]->intr[SIMPLE_MODE_INT], dac ? "" : " not");
+
hba[i]->cmd_pool_bits = kmalloc(((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),
_
Patches currently in -mm which might be from bjorn.helgaas@xxxxxx are
origin.patch
acpi-update-asus_acpi-driver-registration-fix.patch
pnpacpi-reject-acpi_producer-resources.patch
2.6-sony_acpi4.patch
git-klibc.patch
e100-disable-interrupts-at-boot.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
