Doug Maxey wrote:
> From: Doug Maxey <dwm@xxxxxxxxxxx>
>
> Rework some of the printk's in the pci and dma resource allocations to
> - use the appropriate dev_xxx macro.
> - be non conditional
>
> Signed-off-by: Doug Maxey <dwm@xxxxxxxxxxx>
> ---
>
> drivers/scsi/qla4xxx/ql4_os.c | 46 +++++++++++++++--------------------------
> 1 files changed, 17 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
> index 1da7cf8..d88c84f 100644
> --- a/drivers/scsi/qla4xxx/ql4_os.c
> +++ b/drivers/scsi/qla4xxx/ql4_os.c
> @@ -688,7 +688,7 @@ static void qla4xxx_free_adapter(struct
> * @ha: pointer to adapter structure
> *
> * This routines maps HBA's registers from the pci address space
> - * into the kernel virtual address space for memory mapped i/o.
> + * into the kernel virtual address space for memory mapped i/o.
> **/
> static int qla4xxx_iospace_config(struct scsi_qla_host *ha)
> {
> @@ -700,15 +700,12 @@ static int qla4xxx_iospace_config(struct
> pio_flags = pci_resource_flags(ha->pdev, 0);
> if (pio_flags & IORESOURCE_IO) {
> if (pio_len < MIN_IOBASE_LEN) {
> - ql4_printk(KERN_WARNING, ha,
> - "Invalid PCI I/O region size (%s)...\n",
> - pci_name(ha->pdev));
> + dev_warn(&ha->pdev->dev,
> + "Invalid PCI I/O region size\n");
> pio = 0;
> }
> } else {
> - ql4_printk(KERN_WARNING, ha,
> - "region #0 not a PIO resource (%s)...\n",
> - pci_name(ha->pdev));
> + dev_warn(&ha->pdev->dev, "region #0 not a PIO resource\n");
> pio = 0;
> }
>
> @@ -718,23 +715,19 @@ static int qla4xxx_iospace_config(struct
> mmio_flags = pci_resource_flags(ha->pdev, 1);
>
> if (!(mmio_flags & IORESOURCE_MEM)) {
> - ql4_printk(KERN_ERR, ha,
> - "region #0 not an MMIO resource (%s), aborting\n",
> - pci_name(ha->pdev));
> + dev_err(&ha->pdev->dev,
> + "region #0 not an MMIO resource, aborting\n");
> goto iospace_error_exit;
> }
> if (mmio_len < MIN_IOBASE_LEN) {
> - ql4_printk(KERN_ERR, ha,
> - "Invalid PCI mem region size (%s), aborting\n",
> - pci_name(ha->pdev));
> + dev_err(&ha->pdev->dev,
> + "Invalid PCI mem region size, aborting\n");
> goto iospace_error_exit;
> }
>
> if (pci_request_regions(ha->pdev, DRIVER_NAME)) {
> - ql4_printk(KERN_WARNING, ha,
> - "Failed to reserve PIO/MMIO regions (%s)\n",
> - pci_name(ha->pdev));
> -
> + dev_warn(&ha->pdev->dev,
> + "Failed to reserve PIO/MMIO regions\n");
> goto iospace_error_exit;
> }
>
> @@ -742,10 +735,7 @@ static int qla4xxx_iospace_config(struct
> ha->pio_length = pio_len;
> ha->reg = ioremap(mmio, MIN_IOBASE_LEN);
> if (!ha->reg) {
> - ql4_printk(KERN_ERR, ha,
> - "cannot remap MMIO (%s), aborting\n",
> - pci_name(ha->pdev));
> -
> + dev_err(&ha->pdev->dev, "cannot remap MMIO, aborting\n");
> goto iospace_error_exit;
> }
>
> @@ -782,7 +772,7 @@ void qla4xxx_config_dma_addressing(struc
> /**
> * qla4xxx_mem_alloc - allocates memory for use by adapter.
> * @ha: Pointer to host adapter structure
> - *
> + *
> * Allocates DMA memory for request and response queues. Also allocates memory
> * for srbs.
> **/
> @@ -799,9 +789,8 @@ static int qla4xxx_mem_alloc(struct scsi
> ha->queues = dma_alloc_coherent(&ha->pdev->dev, ha->queues_len,
> &ha->queues_dma, GFP_KERNEL);
> if (ha->queues == NULL) {
> - ql4_printk(KERN_WARNING, ha,
> - "Memory Allocation failed - queues.\n");
> -
> + dev_warn(&ha->pdev->dev,
> + "Memory Allocation failed - queues.\n");
> goto mem_alloc_error_exit;
> }
> memset(ha->queues, 0, ha->queues_len);
> @@ -836,9 +825,8 @@ static int qla4xxx_mem_alloc(struct scsi
> ha->srb_mempool = mempool_create(SRB_MIN_REQ, mempool_alloc_slab,
> mempool_free_slab, srb_cachep);
> if (ha->srb_mempool == NULL) {
> - ql4_printk(KERN_WARNING, ha,
> - "Memory Allocation failed - SRB Pool.\n");
> -
> + dev_warn(&ha->pdev->dev,
> + "Memory Allocation failed - SRB Pool.\n");
> goto mem_alloc_error_exit;
Sorry for the late response on this one. As you know I was out for a
while and I was waiting to get internet access yesterday.
For these host messages, do we want something like the sdev_printk and
starget_printk or does it really make more sense to use the pci bus id
for the message prefix? What about other scsi host messages, will they
always go with the pci bus id or some scsi-ml id? And even if we want to
print out the pci bus id as the prefix instead of some scsi info, should
we still have some scsi wrapper?
-
: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
