Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 40aabb5815723551e7c92dd08ed3ea82ec000ccd

Authored by Bjorn Helgaas
Committed by Linus Torvalds
1 parent 4e570309e8
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] CCISS: announce cciss%d devices with PCI address/IRQ/DAC info 

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@garzik.org>:

  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@hp.com>
Acked-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 9 additions and 7 deletions Side-by-side Diff

drivers/block/cciss.c
Diff comments   View file @ 40aabb5
... ... @@ -3086,11 +3086,8 @@
3086 3086 int i;
3087 3087 int j;
3088 3088 int rc;
  3089 + int dac;
3089 3090  
3090   - printk(KERN_DEBUG "cciss: Device 0x%x has been found at"
3091   - " bus %d dev %d func %d\n",
3092   - pdev->device, pdev->bus->number, PCI_SLOT(pdev->devfn),
3093   - PCI_FUNC(pdev->devfn));
3094 3091 i = alloc_cciss_hba();
3095 3092 if(i < 0)
3096 3093 return (-1);
3097 3094  
3098 3095  
... ... @@ -3106,11 +3103,11 @@
3106 3103  
3107 3104 /* configure PCI DMA stuff */
3108 3105 if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK))
3109   - printk("cciss: using DAC cycles\n");
  3106 + dac = 1;
3110 3107 else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK))
3111   - printk("cciss: not using DAC cycles\n");
  3108 + dac = 0;
3112 3109 else {
3113   - printk("cciss: no suitable DMA available\n");
  3110 + printk(KERN_ERR "cciss: no suitable DMA available\n");
3114 3111 goto clean1;
3115 3112 }
3116 3113  
... ... @@ -3141,6 +3138,11 @@
3141 3138 hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname);
3142 3139 goto clean2;
3143 3140 }
  3141 +
  3142 + printk(KERN_INFO "%s: <0x%x> at PCI %s IRQ %d%s using DAC\n",
  3143 + hba[i]->devname, pdev->device, pci_name(pdev),
  3144 + hba[i]->intr[SIMPLE_MODE_INT], dac ? "" : " not");
  3145 +
3144 3146 hba[i]->cmd_pool_bits = kmalloc(((NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG)*sizeof(unsigned long), GFP_KERNEL);
3145 3147 hba[i]->cmd_pool = (CommandList_struct *)pci_alloc_consistent(
3146 3148 hba[i]->pdev, NR_CMDS * sizeof(CommandList_struct),