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

[libata] init probe_ent->private_data in a common location 



Don't write the same code twice, in two different functions, when they
both call the same initialization function, with the same private_data
pointer info.

Also, note a bug found with a FIXME.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent c791c306

drivers/ata/libata-core.c

+1 −0
Original line number Diff line number Diff line
@@ -5785,6 +5785,7 @@ ata_probe_ent_alloc(struct device *dev, const struct ata_port_info *port) 
	probe_ent->mwdma_mask = port->mwdma_mask;

	probe_ent->udma_mask = port->udma_mask;

	probe_ent->port_ops = port->port_ops;

	probe_ent->private_data = port->private_data;



	return probe_ent;

}

drivers/ata/libata-sff.c

+2 −2
Original line number Diff line number Diff line
@@ -828,7 +828,6 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int 


	probe_ent->irq = pdev->irq;

	probe_ent->irq_flags = IRQF_SHARED;

	probe_ent->private_data = port[0]->private_data;



	if (ports & ATA_PORT_PRIMARY) {

		probe_ent->port[p].cmd_addr = pci_resource_start(pdev, 0);
@@ -878,7 +877,6 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, 
		return NULL;



	probe_ent->n_ports = 2;

	probe_ent->private_data = port[0]->private_data;



	if (port_mask & ATA_PORT_PRIMARY) {

		probe_ent->irq = ATA_PRIMARY_IRQ;
@@ -908,6 +906,8 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, 
				probe_ent->_host_flags |= ATA_HOST_SIMPLEX;

		}

		ata_std_ports(&probe_ent->port[1]);



		/* FIXME: could be pointing to stack area; must copy */

		probe_ent->pinfo2 = port[1];

	} else

		probe_ent->dummy_port_mask |= ATA_PORT_SECONDARY;

CRA Git | Maintained and supported by SUSTech CRA and CCSE