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

Commit 06296a1e authored by Joe Perches's avatar Joe Perches Committed by Jeff Garzik
Browse files

ata: Add and use ata_print_version_once 



Use a single mechanism to show driver version.
Reduces text a tiny bit too.

Remove uses of static int printed_version
Add and use ata_print_version(const struct device *, const char *ver)
and ata_print_version_once.

$ size drivers/ata/built-in.*
   text	   data	    bss	    dec	    hex	filename
 544969	  73893	 116584	 735446	  b38d6	drivers/ata/built-in.allyesconfig.ata.o
 543870	  73893	 116592	 734355	  b34ad	drivers/ata/built-in.allyesconfig.print_once.o
 141328	  14689	   4220	 160237	  271ed	drivers/ata/built-in.defconfig.ata.o
 141212	  14689	   4220	 160121	  27179	drivers/ata/built-in.defconfig.print_once.o

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent a9a79dfe

drivers/ata/acard-ahci.c

+1 −3
Original line number Diff line number Diff line
@@ -403,7 +403,6 @@ static int acard_ahci_port_start(struct ata_port *ap) 


static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	static int printed_version;

	unsigned int board_id = ent->driver_data;

	struct ata_port_info pi = acard_ahci_port_info[board_id];

	const struct ata_port_info *ppi[] = { &pi, NULL };
@@ -416,8 +415,7 @@ static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id 


	WARN_ON((int)ATA_MAX_QUEUE > AHCI_MAX_CMDS);



	if (!printed_version++)

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

	ata_print_version_once(&pdev->dev, DRV_VERSION);



	/* acquire resources */

	rc = pcim_enable_device(pdev);

drivers/ata/ahci.c

+1 −3
Original line number Diff line number Diff line
@@ -1059,7 +1059,6 @@ static inline void ahci_gtf_filter_workaround(struct ata_host *host) 


static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	static int printed_version;

	unsigned int board_id = ent->driver_data;

	struct ata_port_info pi = ahci_port_info[board_id];

	const struct ata_port_info *ppi[] = { &pi, NULL };
@@ -1072,8 +1071,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	WARN_ON((int)ATA_MAX_QUEUE > AHCI_MAX_CMDS);



	if (!printed_version++)

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

	ata_print_version_once(&pdev->dev, DRV_VERSION);



	/* The AHCI driver can only drive the SATA ports, the PATA driver

	   can drive them all so if both drivers are selected make sure

drivers/ata/ata_piix.c

+1 −4
Original line number Diff line number Diff line
@@ -1562,7 +1562,6 @@ static bool piix_broken_system_poweroff(struct pci_dev *pdev) 
static int __devinit piix_init_one(struct pci_dev *pdev,

				   const struct pci_device_id *ent)

{

	static int printed_version;

	struct device *dev = &pdev->dev;

	struct ata_port_info port_info[2];

	const struct ata_port_info *ppi[] = { &port_info[0], &port_info[1] };
@@ -1572,9 +1571,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev, 
	struct piix_host_priv *hpriv;

	int rc;



	if (!printed_version++)

		dev_printk(KERN_DEBUG, &pdev->dev,

			   "version " DRV_VERSION "\n");

	ata_print_version_once(&pdev->dev, DRV_VERSION);



	/* no hotplugging support for later devices (FIXME) */

	if (!in_module_init && ent->driver_data >= ich5_sata)

drivers/ata/libata-core.c

+6 −0
Original line number Diff line number Diff line
@@ -6647,6 +6647,12 @@ int ata_dev_printk(const struct ata_device *dev, const char *level, 
}

EXPORT_SYMBOL(ata_dev_printk);



void ata_print_version(const struct device *dev, const char *version)

{

	dev_printk(KERN_DEBUG, dev, "version %s\n", version);

}

EXPORT_SYMBOL(ata_print_version);



/*

 * libata is essentially a library of internal helper functions for

 * low-level ATA host controller drivers.  As such, the API/ABI is

drivers/ata/pata_amd.c

+1 −3
Original line number Diff line number Diff line
@@ -530,14 +530,12 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		}

	};

	const struct ata_port_info *ppi[] = { NULL, NULL };

	static int printed_version;

	int type = id->driver_data;

	void *hpriv = NULL;

	u8 fifo;

	int rc;



	if (!printed_version++)

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

	ata_print_version_once(&pdev->dev, DRV_VERSION);



	rc = pcim_enable_device(pdev);

	if (rc)