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

Commit 1e0aa9ad authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

PNP: fix up after Lindent 



More manual fixups after Lindent.  No functional change.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: default avatarAdam Belay <abelay@novell.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent b377fd39

drivers/pnp/card.c

+8 −8
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ static const struct pnp_card_device_id *match_card(struct pnp_card_driver *drv, 
				int found;

				struct pnp_dev *dev;



				if (i == PNP_MAX_DEVICES

				    || !*drv_id->devs[i].id)

				if (i == PNP_MAX_DEVICES ||

				    !*drv_id->devs[i].id)

					return drv_id;

				found = 0;

				card_for_each_dev(card, dev) {

					if (compare_pnp_id

					    (dev->id, drv_id->devs[i].id)) {

					if (compare_pnp_id(dev->id,

						   drv_id->devs[i].id)) {

						found = 1;

						break;

					}

drivers/pnp/interface.c

+5 −4
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr, 
		up(&pnp_res_mutex);

		goto done;

	}



done:

	if (retval < 0)

		return retval;

drivers/pnp/isapnp/core.c

+6 −9
Original line number Diff line number Diff line
@@ -940,9 +940,6 @@ EXPORT_SYMBOL(isapnp_protocol); 
EXPORT_SYMBOL(isapnp_present);

EXPORT_SYMBOL(isapnp_cfg_begin);

EXPORT_SYMBOL(isapnp_cfg_end);

#if 0

EXPORT_SYMBOL(isapnp_read_byte);

#endif

EXPORT_SYMBOL(isapnp_write_byte);



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)

{

	int ret;



	pnp_init_resource_table(res);

	isapnp_cfg_begin(dev->card->number, dev->number);

	ret = isapnp_read_resources(dev, res);
@@ -1148,13 +1146,12 @@ static int __init isapnp_init(void) 
			}

		}

	}

	if (cards) {

	if (cards)

		printk(KERN_INFO

		       "isapnp: %i Plug & Play card%s detected total\n", cards,

		       cards > 1 ? "s" : "");

	} else {

	else

		printk(KERN_INFO "isapnp: No Plug & Play card found\n");

	}



	isapnp_proc_init();

	return 0;

drivers/pnp/pnpacpi/rsparser.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
static int irq_flags(int triggering, int polarity)

{

	int flag;



	if (triggering == ACPI_LEVEL_SENSITIVE) {

		if (polarity == ACPI_ACTIVE_LOW)

			flag = IORESOURCE_IRQ_LOWLEVEL;

drivers/pnp/pnpbios/core.c

+1 −0
Original line number Diff line number Diff line
@@ -591,6 +591,7 @@ subsys_initcall(pnpbios_init); 
static int __init pnpbios_thread_init(void)

{

	struct task_struct *task;



#if defined(CONFIG_PPC_MERGE)

	if (check_legacy_ioport(PNPBIOS_BASE))

		return 0;