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

Commit 846bb88a authored by Paolo Ciarrocchi's avatar Paolo Ciarrocchi Committed by Bartlomiej Zolnierkiewicz
Browse files

IDE: Coding Style fixes to drivers/ide/setup-pci.c 



File is now error free.
Compile tested.

[bart: minor fixes, md5sum checked]

Signed-off-by: default avatarPaolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 05230e23

drivers/ide/setup-pci.c

+12 −17
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ void ide_setup_pci_noise(struct pci_dev *dev, const struct ide_port_info *d) 
			 " PCI slot %s\n", d->name, dev->vendor, dev->device,

			 dev->revision, pci_name(dev));

}



EXPORT_SYMBOL_GPL(ide_setup_pci_noise);
@@ -212,8 +211,8 @@ static int ide_pci_configure(struct pci_dev *dev, const struct ide_port_info *d) 
	 * Maybe the user deliberately *disabled* the device,

	 * but we'll eventually ignore it again if no drives respond.

	 */

	if (ide_setup_pci_baseregs(dev, d->name) || pci_write_config_word(dev, PCI_COMMAND, pcicmd|PCI_COMMAND_IO)) 

	{

	if (ide_setup_pci_baseregs(dev, d->name) ||

	    pci_write_config_word(dev, PCI_COMMAND, pcicmd | PCI_COMMAND_IO)) {

		printk(KERN_INFO "%s: device disabled (BIOS)\n", d->name);

		return -ENODEV;

	}
@@ -293,8 +292,7 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, 
			return NULL;

		}

	}

	if (!ctl)

	{

	if (!ctl) {

		/* Use default values */

		ctl = port ? 0x374 : 0x3f4;

		base = port ? 0x170 : 0x1f0;
@@ -452,7 +450,6 @@ void ide_pci_setup_ports(struct pci_dev *dev, const struct ide_port_info *d, int 
		*(idx + port) = hwif->index;

	}

}



EXPORT_SYMBOL_GPL(ide_pci_setup_ports);



/*
@@ -535,7 +532,6 @@ int ide_setup_pci_device(struct pci_dev *dev, const struct ide_port_info *d) 


	return ret;

}



EXPORT_SYMBOL_GPL(ide_setup_pci_device);



int ide_setup_pci_devices(struct pci_dev *dev1, struct pci_dev *dev2,
@@ -559,5 +555,4 @@ int ide_setup_pci_devices(struct pci_dev *dev1, struct pci_dev *dev2, 
out:

	return ret;

}



EXPORT_SYMBOL_GPL(ide_setup_pci_devices);