lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PNP: fix up after Lindent

Browse Source 
More manual fixups after Lindent.  No functional change.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: Adam Belay <abelay@novell.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bjorn Helgaas
2007-08-15 10:32:08 -06:00
committed by Len Brown
parent b377fd3982
commit 1e0aa9ad72
10 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pnp/card.c
View File

@@ -25,13 +25,13 @@ static const struct pnp_card_device_id *match_card(struct pnp_card_driver *drv,
int found; int found;
struct pnp_dev *dev; struct pnp_dev *dev;
if (i == PNP_MAX_DEVICES if (i == PNP_MAX_DEVICES ||
|| !*drv_id->devs[i].id) !*drv_id->devs[i].id)
return drv_id; return drv_id;
found = 0; found = 0;
card_for_each_dev(card, dev) { card_for_each_dev(card, dev) {
if (compare_pnp_id if (compare_pnp_id(dev->id,
(dev->id, drv_id->devs[i].id)) { drv_id->devs[i].id)) {
found = 1; found = 1;
break; break;
} }

1
drivers/pnp/interface.c
View File

@@ -459,6 +459,7 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
up(&pnp_res_mutex); up(&pnp_res_mutex);
goto done; goto done;
} }
done: done:
if (retval < 0) if (retval < 0)
return retval; return retval;

9
drivers/pnp/isapnp/core.c
View File

@@ -940,9 +940,6 @@ EXPORT_SYMBOL(isapnp_protocol);
EXPORT_SYMBOL(isapnp_present); EXPORT_SYMBOL(isapnp_present);
EXPORT_SYMBOL(isapnp_cfg_begin); EXPORT_SYMBOL(isapnp_cfg_begin);
EXPORT_SYMBOL(isapnp_cfg_end); EXPORT_SYMBOL(isapnp_cfg_end);
#if 0
EXPORT_SYMBOL(isapnp_read_byte);
#endif
EXPORT_SYMBOL(isapnp_write_byte); EXPORT_SYMBOL(isapnp_write_byte);
static int isapnp_read_resources(struct pnp_dev *dev, static int isapnp_read_resources(struct pnp_dev *dev,
@@ -993,6 +990,7 @@ static int isapnp_get_resources(struct pnp_dev *dev,
struct pnp_resource_table *res) struct pnp_resource_table *res)
{ {
int ret; int ret;
pnp_init_resource_table(res); pnp_init_resource_table(res);
isapnp_cfg_begin(dev->card->number, dev->number); isapnp_cfg_begin(dev->card->number, dev->number);
ret = isapnp_read_resources(dev, res); ret = isapnp_read_resources(dev, res);
@@ -1148,13 +1146,12 @@ static int __init isapnp_init(void)
} }
} }
} }
if (cards) { if (cards)
printk(KERN_INFO printk(KERN_INFO
"isapnp: %i Plug & Play card%s detected total\n", cards, "isapnp: %i Plug & Play card%s detected total\n", cards,
cards > 1 ? "s" : ""); cards > 1 ? "s" : "");
} else { else
printk(KERN_INFO "isapnp: No Plug & Play card found\n"); printk(KERN_INFO "isapnp: No Plug & Play card found\n");
}
isapnp_proc_init(); isapnp_proc_init();
return 0; return 0;

1
drivers/pnp/pnpacpi/rsparser.c
View File

@@ -35,6 +35,7 @@
static int irq_flags(int triggering, int polarity) static int irq_flags(int triggering, int polarity)
{ {
int flag; int flag;
if (triggering == ACPI_LEVEL_SENSITIVE) { if (triggering == ACPI_LEVEL_SENSITIVE) {
if (polarity == ACPI_ACTIVE_LOW) if (polarity == ACPI_ACTIVE_LOW)
flag = IORESOURCE_IRQ_LOWLEVEL; flag = IORESOURCE_IRQ_LOWLEVEL;

1
drivers/pnp/pnpbios/core.c
View File

@@ -591,6 +591,7 @@ subsys_initcall(pnpbios_init);
static int __init pnpbios_thread_init(void) static int __init pnpbios_thread_init(void)
{ {
struct task_struct *task; struct task_struct *task;
#if defined(CONFIG_PPC_MERGE) #if defined(CONFIG_PPC_MERGE)
if (check_legacy_ioport(PNPBIOS_BASE)) if (check_legacy_ioport(PNPBIOS_BASE))
return 0; return 0;

1
drivers/pnp/pnpbios/rsparser.c
View File

@@ -298,6 +298,7 @@ static void pnpbios_parse_fixed_mem32_option(unsigned char *p, int size,
struct pnp_option *option) struct pnp_option *option)
{ {
struct pnp_mem *mem; struct pnp_mem *mem;
mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
if (!mem) if (!mem)
return; return;