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

Commit 1bd5b715 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: make ata_pci_init_one() not use ops->irq_handler and pi->sht 



ata_pci_init_one() is the only function which uses ops->irq_handler
and pi->sht.  Other initialization functions take the same information
as arguments.  This causes confusion and duplicate unused entries in
structures.

Make ata_pci_init_one() take sht as an argument and use ata_interrupt
implicitly.  All current users use ata_interrupt and if different irq
handler is necessary open coding ata_pci_init_one() using
ata_prepare_sff_host() and ata_activate_sff_host can be done under ten
lines including error handling and driver which requires custom
interrupt handler is likely to require custom initialization anyway.

As ata_pci_init_one() was the last user of ops->irq_handler, this
patch also kills the field.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
parent 029cfd6b

drivers/ata/ata_generic.c

+1 −2
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id 
{

	u16 command;

	static const struct ata_port_info info = {

		.sht = &generic_sht,

		.flags = ATA_FLAG_SLAVE_POSS,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,
@@ -153,7 +152,7 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id 
	if (dev->vendor == PCI_VENDOR_ID_AL)

	    	ata_pci_clear_simplex(dev);



	return ata_pci_init_one(dev, ppi);

	return ata_pci_init_one(dev, ppi, &generic_sht);

}



static struct pci_device_id ata_generic[] = {

drivers/ata/libata-core.c

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ const struct ata_port_operations ata_sff_port_ops = { 
	.irq_on			= ata_irq_on,



	.port_start		= ata_sff_port_start,

	.irq_handler		= ata_interrupt,

};



const struct ata_port_operations ata_bmdma_port_ops = {

drivers/ata/libata-sff.c

+4 −3
Original line number Diff line number Diff line
@@ -826,6 +826,7 @@ int ata_pci_activate_sff_host(struct ata_host *host, 
 *	ata_pci_init_one - Initialize/register PCI IDE host 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

 *

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

 *	xxx_init_one() probe function if the hardware uses traditional
@@ -846,7 +847,8 @@ int ata_pci_activate_sff_host(struct ata_host *host, 
 *	Zero on success, negative on errno-based value on error.

 */

int ata_pci_init_one(struct pci_dev *pdev,

		     const struct ata_port_info * const * ppi)

		     const struct ata_port_info * const * ppi,

		     struct scsi_host_template *sht)

{

	struct device *dev = &pdev->dev;

	const struct ata_port_info *pi = NULL;
@@ -882,8 +884,7 @@ int ata_pci_init_one(struct pci_dev *pdev, 
		goto out;



	pci_set_master(pdev);

	rc = ata_pci_activate_sff_host(host, pi->port_ops->irq_handler,

				       pi->sht);

	rc = ata_pci_activate_sff_host(host, ata_interrupt, sht);

 out:

	if (rc == 0)

		devres_remove_group(&pdev->dev, NULL);

drivers/ata/pata_acpi.c

+1 −2
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ static struct ata_port_operations pacpi_ops = { 
static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id)

{

	static const struct ata_port_info info = {

		.sht		= &pacpi_sht,

		.flags		= ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,



		.pio_mask	= 0x1f,
@@ -274,7 +273,7 @@ static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id) 
		.port_ops	= &pacpi_ops,

	};

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

	return ata_pci_init_one(pdev, ppi);

	return ata_pci_init_one(pdev, ppi, &pacpi_sht);

}



static const struct pci_device_id pacpi_pci_tbl[] = {

drivers/ata/pata_ali.c

+1 −8
Original line number Diff line number Diff line
@@ -463,14 +463,12 @@ static void ali_init_chipset(struct pci_dev *pdev) 
static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)

{

	static const struct ata_port_info info_early = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS,

		.pio_mask = 0x1f,

		.port_ops = &ali_early_port_ops

	};

	/* Revision 0x20 added DMA */

	static const struct ata_port_info info_20 = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,
@@ -478,7 +476,6 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	};

	/* Revision 0x20 with support logic added UDMA */

	static const struct ata_port_info info_20_udma = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,
@@ -487,7 +484,6 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	};

	/* Revision 0xC2 adds UDMA66 */

	static const struct ata_port_info info_c2 = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,
@@ -496,7 +492,6 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	};

	/* Revision 0xC3 is UDMA66 for now */

	static const struct ata_port_info info_c3 = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,
@@ -505,7 +500,6 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	};

	/* Revision 0xC4 is UDMA100 */

	static const struct ata_port_info info_c4 = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,
@@ -514,7 +508,6 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	};

	/* Revision 0xC5 is UDMA133 with LBA48 DMA */

	static const struct ata_port_info info_c5 = {

		.sht = &ali_sht,

		.flags = ATA_FLAG_SLAVE_POSS,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,
@@ -559,7 +552,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	        	ppi[0] = &info_20_udma;

		pci_dev_put(isa_bridge);

	}

	return ata_pci_init_one(pdev, ppi);

	return ata_pci_init_one(pdev, ppi, &ali_sht);

}



#ifdef CONFIG_PM