Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9524a76 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] use dev_printk() throughout drivers 

A few drivers were not following the standard meme of printing out
their driver name and version at module load time; this is fixed
as well.
parent fbf30fba

drivers/scsi/ahci.c

+21 −21
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <linux/interrupt.h>

#include <linux/sched.h>

#include <linux/dma-mapping.h>

#include <linux/device.h>

#include "scsi.h"

#include <scsi/scsi_host.h>

#include <linux/libata.h>
@@ -675,9 +676,9 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs * 
				if (ata_ratelimit()) {

					struct pci_dev *pdev =

						to_pci_dev(ap->host_set->dev);

					printk(KERN_WARNING

					  "ahci(%s): unhandled interrupt on port %u\n",

					  pci_name(pdev), i);

					dev_printk(KERN_WARNING, &pdev->dev,

					  "unhandled interrupt on port %u\n",

					  i);

				}



			VPRINTK("port %u\n", i);
@@ -686,9 +687,8 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs * 
			if (ata_ratelimit()) {

				struct pci_dev *pdev =

					to_pci_dev(ap->host_set->dev);

				printk(KERN_WARNING

				  "ahci(%s): interrupt on disabled port %u\n",

				  pci_name(pdev), i);

				dev_printk(KERN_WARNING, &pdev->dev,

					"interrupt on disabled port %u\n", i);

			}

		}
@@ -760,8 +760,8 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent) 


	tmp = readl(mmio + HOST_CTL);

	if (tmp & HOST_RESET) {

		printk(KERN_ERR DRV_NAME "(%s): controller reset failed (0x%x)\n",

			pci_name(pdev), tmp);

		dev_printk(KERN_ERR, &pdev->dev,

			   "controller reset failed (0x%x)\n", tmp);

		return -EIO;

	}
@@ -789,22 +789,22 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent) 
		if (rc) {

			rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);

			if (rc) {

				printk(KERN_ERR DRV_NAME "(%s): 64-bit DMA enable failed\n",

					pci_name(pdev));

				dev_printk(KERN_ERR, &pdev->dev,

					   "64-bit DMA enable failed\n");

				return rc;

			}

		}

	} else {

		rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);

		if (rc) {

			printk(KERN_ERR DRV_NAME "(%s): 32-bit DMA enable failed\n",

				pci_name(pdev));

			dev_printk(KERN_ERR, &pdev->dev,

				   "32-bit DMA enable failed\n");

			return rc;

		}

		rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);

		if (rc) {

			printk(KERN_ERR DRV_NAME "(%s): 32-bit consistent DMA enable failed\n",

				pci_name(pdev));

			dev_printk(KERN_ERR, &pdev->dev,

				   "32-bit consistent DMA enable failed\n");

			return rc;

		}

	}
@@ -907,10 +907,10 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent) 
	else

		scc_s = "unknown";



	printk(KERN_INFO DRV_NAME "(%s) AHCI %02x%02x.%02x%02x "

	dev_printk(KERN_INFO, &pdev->dev,

		"AHCI %02x%02x.%02x%02x "

		"%u slots %u ports %s Gbps 0x%x impl %s mode\n"

	       	,

	       	pci_name(pdev),



	       	(vers >> 24) & 0xff,

	       	(vers >> 16) & 0xff,
@@ -923,11 +923,11 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent) 
		impl,

		scc_s);



	printk(KERN_INFO DRV_NAME "(%s) flags: "

	dev_printk(KERN_INFO, &pdev->dev,

		"flags: "

	       	"%s%s%s%s%s%s"

	       	"%s%s%s%s%s%s%s\n"

	       	,

	       	pci_name(pdev),



		cap & (1 << 31) ? "64bit " : "",

		cap & (1 << 30) ? "ncq " : "",
@@ -960,7 +960,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	VPRINTK("ENTER\n");



	if (!printed_version++)

		printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");

		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");



	rc = pci_enable_device(pdev);

	if (rc)

drivers/scsi/pdc_adma.c

+6 −7
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/sched.h>

#include <linux/device.h>

#include "scsi.h"

#include <scsi/scsi_host.h>

#include <asm/io.h>
@@ -626,16 +627,14 @@ static int adma_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base) 


	rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);

	if (rc) {

		printk(KERN_ERR DRV_NAME

			"(%s): 32-bit DMA enable failed\n",

			pci_name(pdev));

		dev_printk(KERN_ERR, &pdev->dev,

			"32-bit DMA enable failed\n");

		return rc;

	}

	rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);

	if (rc) {

		printk(KERN_ERR DRV_NAME

			"(%s): 32-bit consistent DMA enable failed\n",

			pci_name(pdev));

		dev_printk(KERN_ERR, &pdev->dev,

			"32-bit consistent DMA enable failed\n");

		return rc;

	}

	return 0;
@@ -651,7 +650,7 @@ static int adma_ata_init_one(struct pci_dev *pdev, 
	int rc, port_no;



	if (!printed_version++)

		printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");

		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");



	rc = pci_enable_device(pdev);

	if (rc)

drivers/scsi/sata_mv.c

+6 −6
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/interrupt.h>

#include <linux/sched.h>

#include <linux/dma-mapping.h>

#include <linux/device.h>

#include "scsi.h"

#include <scsi/scsi_host.h>

#include <linux/libata.h>
@@ -1437,9 +1438,9 @@ static void mv_print_info(struct ata_probe_ent *probe_ent) 
	else

		scc_s = "unknown";



	printk(KERN_INFO DRV_NAME 

	       "(%s) %u slots %u ports %s mode IRQ via %s\n",

	       pci_name(pdev), (unsigned)MV_MAX_Q_DEPTH, probe_ent->n_ports, 

	dev_printk(KERN_INFO, &pdev->dev,

	       "%u slots %u ports %s mode IRQ via %s\n",

	       (unsigned)MV_MAX_Q_DEPTH, probe_ent->n_ports, 

	       scc_s, (MV_HP_FLAG_MSI & hpriv->hp_flags) ? "MSI" : "INTx");

}
@@ -1460,9 +1461,8 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	void __iomem *mmio_base;

	int pci_dev_busy = 0, rc;



	if (!printed_version++) {

		printk(KERN_INFO DRV_NAME " version " DRV_VERSION "\n");

	}

	if (!printed_version++)

		dev_printk(KERN_INFO, &pdev->dev, "version " DRV_VERSION "\n");



	rc = pci_enable_device(pdev);

	if (rc) {

drivers/scsi/sata_nv.c

+2 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include <linux/blkdev.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/device.h>

#include "scsi.h"

#include <scsi/scsi_host.h>

#include <linux/libata.h>
@@ -383,7 +384,7 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
			return -ENODEV;



	if (!printed_version++)

		printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");

		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");



	rc = pci_enable_device(pdev);

	if (rc)

drivers/scsi/sata_promise.c

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/sched.h>

#include <linux/device.h>

#include "scsi.h"

#include <scsi/scsi_host.h>

#include <linux/libata.h>
@@ -633,7 +634,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e 
	int rc;



	if (!printed_version++)

		printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");

		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");



	/*

	 * If this driver happens to only be useful on Apple's K2, then