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

Commit c2036033 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Jeff Garzik
Browse files

libata: reduce ata_pci_[sff,bmdma]_init_one() size 



Turn both helpers (which are used only during LLDs initialization
time and thus are not performance sensitive) into wrappers around
the new ata_pci_init_one() function, this cuts 20 LOC and saves
~1.1k of the output code size (x86-64):

 text    data     bss     dec     hex filename
  21392       0      19   21411    53a3 drivers/ata/libata-sff.o.before
  20256       0      19   20275    4f33 drivers/ata/libata-sff.o.after

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent e9f7cd51

drivers/ata/libata-sff.c

+46 −65
Original line number Diff line number Diff line
@@ -2507,31 +2507,10 @@ static const struct ata_port_info *ata_sff_find_valid_pi( 
	return NULL;

}



/**

 *	ata_pci_sff_init_one - Initialize/register PIO-only PCI IDE controller

 *	@pdev: Controller to be initialized

 *	@ppi: array of port_info, must be enough for two ports

 *	@sht: scsi_host_template to use when registering the host

 *	@host_priv: host private_data

 *	@hflag: host flags

 *

 *	This is a helper function which can be called from a driver's

 *	xxx_init_one() probe function if the hardware uses traditional

 *	IDE taskfile registers and is PIO only.

 *

 *	ASSUMPTION:

 *	Nobody makes a single channel controller that appears solely as

 *	the secondary legacy port on PCI.

 *

 *	LOCKING:

 *	Inherited from PCI layer (may sleep).

 *

 *	RETURNS:

 *	Zero on success, negative on errno-based value on error.

 */

int ata_pci_sff_init_one(struct pci_dev *pdev,

static int ata_pci_init_one(struct pci_dev *pdev,

		const struct ata_port_info * const *ppi,

		 struct scsi_host_template *sht, void *host_priv, int hflag)

		struct scsi_host_template *sht, void *host_priv,

		int hflags, bool bmdma)

{

	struct device *dev = &pdev->dev;

	const struct ata_port_info *pi;
@@ -2553,13 +2532,21 @@ int ata_pci_sff_init_one(struct pci_dev *pdev, 
	if (rc)

		goto out;



	if (bmdma)

		/* prepare and activate BMDMA host */

		rc = ata_pci_bmdma_prepare_host(pdev, ppi, &host);

	else

		/* prepare and activate SFF host */

		rc = ata_pci_sff_prepare_host(pdev, ppi, &host);

	if (rc)

		goto out;

	host->private_data = host_priv;

	host->flags |= hflag;

	host->flags |= hflags;



	if (bmdma) {

		pci_set_master(pdev);

		rc = ata_pci_sff_activate_host(host, ata_bmdma_interrupt, sht);

	} else

		rc = ata_pci_sff_activate_host(host, ata_sff_interrupt, sht);

out:

	if (rc == 0)
@@ -2569,6 +2556,35 @@ out: 


	return rc;

}



/**

 *	ata_pci_sff_init_one - Initialize/register PIO-only PCI IDE controller

 *	@pdev: Controller to be initialized

 *	@ppi: array of port_info, must be enough for two ports

 *	@sht: scsi_host_template to use when registering the host

 *	@host_priv: host private_data

 *	@hflag: host flags

 *

 *	This is a helper function which can be called from a driver's

 *	xxx_init_one() probe function if the hardware uses traditional

 *	IDE taskfile registers and is PIO only.

 *

 *	ASSUMPTION:

 *	Nobody makes a single channel controller that appears solely as

 *	the secondary legacy port on PCI.

 *

 *	LOCKING:

 *	Inherited from PCI layer (may sleep).

 *

 *	RETURNS:

 *	Zero on success, negative on errno-based value on error.

 */

int ata_pci_sff_init_one(struct pci_dev *pdev,

		 const struct ata_port_info * const *ppi,

		 struct scsi_host_template *sht, void *host_priv, int hflag)

{

	return ata_pci_init_one(pdev, ppi, sht, host_priv, hflag, 0);

}

EXPORT_SYMBOL_GPL(ata_pci_sff_init_one);



#endif /* CONFIG_PCI */
@@ -3286,42 +3302,7 @@ int ata_pci_bmdma_init_one(struct pci_dev *pdev, 
			   struct scsi_host_template *sht, void *host_priv,

			   int hflags)

{

	struct device *dev = &pdev->dev;

	const struct ata_port_info *pi;

	struct ata_host *host = NULL;

	int rc;



	DPRINTK("ENTER\n");



	pi = ata_sff_find_valid_pi(ppi);

	if (!pi) {

		dev_err(&pdev->dev, "no valid port_info specified\n");

		return -EINVAL;

	}



	if (!devres_open_group(dev, NULL, GFP_KERNEL))

		return -ENOMEM;



	rc = pcim_enable_device(pdev);

	if (rc)

		goto out;



	/* prepare and activate BMDMA host */

	rc = ata_pci_bmdma_prepare_host(pdev, ppi, &host);

	if (rc)

		goto out;

	host->private_data = host_priv;

	host->flags |= hflags;



	pci_set_master(pdev);

	rc = ata_pci_sff_activate_host(host, ata_bmdma_interrupt, sht);

 out:

	if (rc == 0)

		devres_remove_group(&pdev->dev, NULL);

	else

		devres_release_group(&pdev->dev, NULL);



	return rc;

	return ata_pci_init_one(pdev, ppi, sht, host_priv, hflags, 1);

}

EXPORT_SYMBOL_GPL(ata_pci_bmdma_init_one);