OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Paolo Ciarrocchi 2008-04-26 17:36:39 +02:00 committed by Bartlomiej Zolnierkiewicz
parent 05230e23cf
commit 846bb88ae8
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/ide/setup-pci.c
View File

@ -33,7 +33,7 @@
* we don't switch it back to legacy mode. Do we actually care ?? * we don't switch it back to legacy mode. Do we actually care ??
*/ */
static int ide_setup_pci_baseregs (struct pci_dev *dev, const char *name) static int ide_setup_pci_baseregs(struct pci_dev *dev, const char *name)
{ {
u8 progif = 0; u8 progif = 0;
@ -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, " PCI slot %s\n", d->name, dev->vendor, dev->device,
dev->revision, pci_name(dev)); dev->revision, pci_name(dev));
} }
EXPORT_SYMBOL_GPL(ide_setup_pci_noise); 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, * Maybe the user deliberately *disabled* the device,
* but we'll eventually ignore it again if no drives respond. * 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); printk(KERN_INFO "%s: device disabled (BIOS)\n", d->name);
return -ENODEV; return -ENODEV;
} }
@ -293,8 +292,7 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev,
return NULL; return NULL;
} }
} }
if (!ctl) if (!ctl) {
{
/* Use default values */ /* Use default values */
ctl = port ? 0x374 : 0x3f4; ctl = port ? 0x374 : 0x3f4;
base = port ? 0x170 : 0x1f0; 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; *(idx + port) = hwif->index;
} }
} }
EXPORT_SYMBOL_GPL(ide_pci_setup_ports); 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; return ret;
} }
EXPORT_SYMBOL_GPL(ide_setup_pci_device); EXPORT_SYMBOL_GPL(ide_setup_pci_device);
int ide_setup_pci_devices(struct pci_dev *dev1, struct pci_dev *dev2, 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: out:
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(ide_setup_pci_devices); EXPORT_SYMBOL_GPL(ide_setup_pci_devices);