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

Commit 86ccf37c authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove pciirq argument from ide_pci_setup_ports() 



* Set ->irq explicitly in cs5520.c.

* Remove irq argument from ide_hw_configure().

* Remove pciirq argument from ide_pci_setup_ports().

There should be no functional changes caused by this patch.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 2ed0ef54

drivers/ide/cs5520.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -133,7 +133,8 @@ static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_devic 
	 *	do all the device setup for us

	 *	do all the device setup for us

	 */

	 */





	ide_pci_setup_ports(dev, d, 14, &hw[0], &hws[0]);

	ide_pci_setup_ports(dev, d, &hw[0], &hws[0]);

	hw[0].irq = 14;





	return ide_host_add(d, hws, NULL);

	return ide_host_add(d, hws, NULL);

}

}

drivers/ide/setup-pci.c

+5 −8
Original line number Original line Diff line number Diff line
@@ -305,7 +305,6 @@ static int ide_pci_check_iomem(struct pci_dev *dev, const struct ide_port_info * 
 *	@dev: PCI device holding interface

 *	@dev: PCI device holding interface

 *	@d: IDE port info

 *	@d: IDE port info

 *	@port: port number

 *	@port: port number

 *	@irq: PCI IRQ

 *	@hw: hw_regs_t instance corresponding to this port

 *	@hw: hw_regs_t instance corresponding to this port

 *

 *

 *	Perform the initial set up for the hardware interface structure. This

 *	Perform the initial set up for the hardware interface structure. This
@@ -316,7 +315,7 @@ static int ide_pci_check_iomem(struct pci_dev *dev, const struct ide_port_info * 
 */

 */





static int ide_hw_configure(struct pci_dev *dev, const struct ide_port_info *d,

static int ide_hw_configure(struct pci_dev *dev, const struct ide_port_info *d,

			    unsigned int port, int irq, hw_regs_t *hw)

			    unsigned int port, hw_regs_t *hw)

{

{

	unsigned long ctl = 0, base = 0;

	unsigned long ctl = 0, base = 0;
@@ -344,7 +343,6 @@ static int ide_hw_configure(struct pci_dev *dev, const struct ide_port_info *d, 
	}

	}





	memset(hw, 0, sizeof(*hw));

	memset(hw, 0, sizeof(*hw));

	hw->irq = irq;

	hw->dev = &dev->dev;

	hw->dev = &dev->dev;

	hw->chipset = d->chipset ? d->chipset : ide_pci;

	hw->chipset = d->chipset ? d->chipset : ide_pci;

	ide_std_init_ports(hw, base, ctl | 2);

	ide_std_init_ports(hw, base, ctl | 2);
@@ -448,7 +446,6 @@ static int ide_setup_pci_controller(struct pci_dev *dev, 
 *	ide_pci_setup_ports	-	configure ports/devices on PCI IDE

 *	ide_pci_setup_ports	-	configure ports/devices on PCI IDE

 *	@dev: PCI device

 *	@dev: PCI device

 *	@d: IDE port info

 *	@d: IDE port info

 *	@pciirq: IRQ line

 *	@hw: hw_regs_t instances corresponding to this PCI IDE device

 *	@hw: hw_regs_t instances corresponding to this PCI IDE device

 *	@hws: hw_regs_t pointers table to update

 *	@hws: hw_regs_t pointers table to update

 *

 *
@@ -462,7 +459,7 @@ static int ide_setup_pci_controller(struct pci_dev *dev, 
 */

 */





void ide_pci_setup_ports(struct pci_dev *dev, const struct ide_port_info *d,

void ide_pci_setup_ports(struct pci_dev *dev, const struct ide_port_info *d,

			 int pciirq, hw_regs_t *hw, hw_regs_t **hws)

			 hw_regs_t *hw, hw_regs_t **hws)

{

{

	int channels = (d->host_flags & IDE_HFLAG_SINGLE) ? 1 : 2, port;

	int channels = (d->host_flags & IDE_HFLAG_SINGLE) ? 1 : 2, port;

	u8 tmp;

	u8 tmp;
@@ -481,7 +478,7 @@ void ide_pci_setup_ports(struct pci_dev *dev, const struct ide_port_info *d, 
			continue;	/* port not enabled */

			continue;	/* port not enabled */

		}

		}





		if (ide_hw_configure(dev, d, port, pciirq, hw + port))

		if (ide_hw_configure(dev, d, port, hw + port))

			continue;

			continue;





		*(hws + port) = hw + port;

		*(hws + port) = hw + port;
@@ -549,7 +546,7 @@ int ide_pci_init_one(struct pci_dev *dev, const struct ide_port_info *d, 
	if (ret < 0)

	if (ret < 0)

		goto out;

		goto out;





	ide_pci_setup_ports(dev, d, 0, &hw[0], &hws[0]);

	ide_pci_setup_ports(dev, d, &hw[0], &hws[0]);





	host = ide_host_alloc(d, hws);

	host = ide_host_alloc(d, hws);

	if (host == NULL) {

	if (host == NULL) {
@@ -595,7 +592,7 @@ int ide_pci_init_two(struct pci_dev *dev1, struct pci_dev *dev2, 
		if (ret < 0)

		if (ret < 0)

			goto out;

			goto out;





		ide_pci_setup_ports(pdev[i], d, 0, &hw[i*2], &hws[i*2]);

		ide_pci_setup_ports(pdev[i], d, &hw[i*2], &hws[i*2]);

	}

	}





	host = ide_host_alloc(d, hws);

	host = ide_host_alloc(d, hws);

include/linux/ide.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1265,7 +1265,7 @@ static inline int ide_pci_is_in_compatibility_mode(struct pci_dev *dev) 
	return 0;

	return 0;

}

}





void ide_pci_setup_ports(struct pci_dev *, const struct ide_port_info *, int,

void ide_pci_setup_ports(struct pci_dev *, const struct ide_port_info *,

			 hw_regs_t *, hw_regs_t **);

			 hw_regs_t *, hw_regs_t **);

void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *);

void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *);