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

Commit 07d4e9af authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

PNP: fix up after Lindent 



These are manual fixups after running Lindent.  No functional change.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Adam Belay <ambx1@neo.rr.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9dd78466

drivers/pnp/card.c

+15 −18
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
 * card.c - contains functions for managing groups of PnP devices

 *

 * Copyright 2002 Adam Belay <ambx1@neo.rr.com>

 *

 */



#include <linux/module.h>
@@ -17,12 +16,15 @@ static const struct pnp_card_device_id *match_card(struct pnp_card_driver *drv, 
						   struct pnp_card *card)

{

	const struct pnp_card_device_id *drv_id = drv->id_table;



	while (*drv_id->id) {

		if (compare_pnp_id(card->id, drv_id->id)) {

			int i = 0;



			for (;;) {

				int found;

				struct pnp_dev *dev;



				if (i == PNP_MAX_DEVICES

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

					return drv_id;
@@ -52,6 +54,7 @@ static void card_remove(struct pnp_dev *dev) 
static void card_remove_first(struct pnp_dev *dev)

{

	struct pnp_card_driver *drv = to_pnp_card_driver(dev->driver);



	if (!dev->card || !drv)

		return;

	if (drv->remove)
@@ -96,12 +99,11 @@ static int card_probe(struct pnp_card *card, struct pnp_card_driver *drv) 
 * pnp_add_card_id - adds an EISA id to the specified card

 * @id: pointer to a pnp_id structure

 * @card: pointer to the desired card

 *

 */



int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card)

{

	struct pnp_id *ptr;



	if (!id)

		return -EINVAL;

	if (!card)
@@ -121,6 +123,7 @@ static void pnp_free_card_ids(struct pnp_card *card) 
{

	struct pnp_id *id;

	struct pnp_id *next;



	if (!card)

		return;

	id = card->id;
@@ -134,6 +137,7 @@ static void pnp_free_card_ids(struct pnp_card *card) 
static void pnp_release_card(struct device *dmdev)

{

	struct pnp_card *card = to_pnp_card(dmdev);



	pnp_free_card_ids(card);

	kfree(card);

}
@@ -143,6 +147,7 @@ static ssize_t pnp_show_card_name(struct device *dmdev, 
{

	char *str = buf;

	struct pnp_card *card = to_pnp_card(dmdev);



	str += sprintf(str, "%s\n", card->name);

	return (str - buf);

}
@@ -168,6 +173,7 @@ static DEVICE_ATTR(card_id, S_IRUGO, pnp_show_card_ids, NULL); 
static int pnp_interface_attach_card(struct pnp_card *card)

{

	int rc = device_create_file(&card->dev, &dev_attr_name);



	if (rc)

		return rc;
@@ -186,11 +192,11 @@ static int pnp_interface_attach_card(struct pnp_card *card) 
 * pnp_add_card - adds a PnP card to the PnP Layer

 * @card: pointer to the card to add

 */



int pnp_add_card(struct pnp_card *card)

{

	int error;

	struct list_head *pos, *temp;



	if (!card || !card->protocol)

		return -EINVAL;
@@ -233,10 +239,10 @@ int pnp_add_card(struct pnp_card *card) 
 * pnp_remove_card - removes a PnP card from the PnP Layer

 * @card: pointer to the card to remove

 */



void pnp_remove_card(struct pnp_card *card)

{

	struct list_head *pos, *temp;



	if (!card)

		return;

	device_unregister(&card->dev);
@@ -255,7 +261,6 @@ void pnp_remove_card(struct pnp_card *card) 
 * @card: pointer to the card to add to

 * @dev: pointer to the device to add

 */



int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev)

{

	if (!card || !dev || !dev->protocol)
@@ -275,7 +280,6 @@ int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev) 
 * pnp_remove_card_device- removes a device from the specified card

 * @dev: pointer to the device to remove

 */



void pnp_remove_card_device(struct pnp_dev *dev)

{

	spin_lock(&pnp_lock);
@@ -291,7 +295,6 @@ void pnp_remove_card_device(struct pnp_dev *dev) 
 * @id: pointer to a PnP ID structure that explains the rules for finding the device

 * @from: Starting place to search from. If NULL it will start from the begining.

 */



struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink,

					const char *id, struct pnp_dev *from)

{
@@ -299,6 +302,7 @@ struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, 
	struct pnp_dev *dev;

	struct pnp_card_driver *drv;

	struct pnp_card *card;



	if (!clink || !id)

		goto done;

	card = clink->card;
@@ -340,10 +344,10 @@ struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, 
 * pnp_release_card_device - call this when the driver no longer needs the device

 * @dev: pointer to the PnP device stucture

 */



void pnp_release_card_device(struct pnp_dev *dev)

{

	struct pnp_card_driver *drv = dev->card_link->driver;



	if (!drv)

		return;

	drv->link.remove = &card_remove;
@@ -357,6 +361,7 @@ void pnp_release_card_device(struct pnp_dev *dev) 
static int card_suspend(struct pnp_dev *dev, pm_message_t state)

{

	struct pnp_card_link *link = dev->card_link;



	if (link->pm_state.event == state.event)

		return 0;

	link->pm_state = state;
@@ -366,6 +371,7 @@ static int card_suspend(struct pnp_dev *dev, pm_message_t state) 
static int card_resume(struct pnp_dev *dev)

{

	struct pnp_card_link *link = dev->card_link;



	if (link->pm_state.event == PM_EVENT_ON)

		return 0;

	link->pm_state = PMSG_ON;
@@ -377,7 +383,6 @@ static int card_resume(struct pnp_dev *dev) 
 * pnp_register_card_driver - registers a PnP card driver with the PnP Layer

 * @drv: pointer to the driver to register

 */



int pnp_register_card_driver(struct pnp_card_driver *drv)

{

	int error;
@@ -411,7 +416,6 @@ int pnp_register_card_driver(struct pnp_card_driver *drv) 
 * pnp_unregister_card_driver - unregisters a PnP card driver from the PnP Layer

 * @drv: pointer to the driver to unregister

 */



void pnp_unregister_card_driver(struct pnp_card_driver *drv)

{

	spin_lock(&pnp_lock);
@@ -420,13 +424,6 @@ void pnp_unregister_card_driver(struct pnp_card_driver *drv) 
	pnp_unregister_driver(&drv->link);

}



#if 0

EXPORT_SYMBOL(pnp_add_card);

EXPORT_SYMBOL(pnp_remove_card);

EXPORT_SYMBOL(pnp_add_card_device);

EXPORT_SYMBOL(pnp_remove_card_device);

EXPORT_SYMBOL(pnp_add_card_id);

#endif /*  0  */

EXPORT_SYMBOL(pnp_request_card_device);

EXPORT_SYMBOL(pnp_release_card_device);

EXPORT_SYMBOL(pnp_register_card_driver);

drivers/pnp/core.c

+3 −26
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
 * core.c - contains all core device and protocol registration functions

 *

 * Copyright 2002 Adam Belay <ambx1@neo.rr.com>

 *

 */



#include <linux/pnp.h>
@@ -48,7 +47,6 @@ void *pnp_alloc(long size) 
 *

 *  Ex protocols: ISAPNP, PNPBIOS, etc

 */



int pnp_register_protocol(struct pnp_protocol *protocol)

{

	int nodenum;
@@ -82,7 +80,6 @@ int pnp_register_protocol(struct pnp_protocol *protocol) 
/**

 * pnp_protocol_unregister - removes a pnp protocol from the pnp layer

 * @protocol: pointer to the corresponding pnp_protocol structure

 *

 */

void pnp_unregister_protocol(struct pnp_protocol *protocol)

{
@@ -96,6 +93,7 @@ static void pnp_free_ids(struct pnp_dev *dev) 
{

	struct pnp_id *id;

	struct pnp_id *next;



	if (!dev)

		return;

	id = dev->id;
@@ -109,6 +107,7 @@ static void pnp_free_ids(struct pnp_dev *dev) 
static void pnp_release_device(struct device *dmdev)

{

	struct pnp_dev *dev = to_pnp_dev(dmdev);



	pnp_free_option(dev->independent);

	pnp_free_option(dev->dependent);

	pnp_free_ids(dev);
@@ -118,6 +117,7 @@ static void pnp_release_device(struct device *dmdev) 
int __pnp_add_device(struct pnp_dev *dev)

{

	int ret;



	pnp_fixup_device(dev);

	dev->dev.bus = &pnp_bus_type;

	dev->dev.dma_mask = &dev->dma_mask;
@@ -141,7 +141,6 @@ int __pnp_add_device(struct pnp_dev *dev) 
 *

 *  adds to driver model, name database, fixups, interface, etc.

 */



int pnp_add_device(struct pnp_dev *dev)

{

	if (!dev || !dev->protocol || dev->card)
@@ -161,21 +160,6 @@ void __pnp_remove_device(struct pnp_dev *dev) 
	device_unregister(&dev->dev);

}



/**

 * pnp_remove_device - removes a pnp device from the pnp layer

 * @dev: pointer to dev to add

 *

 * this function will free all mem used by dev

 */

#if 0

void pnp_remove_device(struct pnp_dev *dev)

{

	if (!dev || dev->card)

		return;

	__pnp_remove_device(dev);

}

#endif /*  0  */



static int __init pnp_init(void)

{

	printk(KERN_INFO "Linux Plug and Play Support v0.97 (c) Adam Belay\n");
@@ -183,10 +167,3 @@ static int __init pnp_init(void) 
}



subsys_initcall(pnp_init);
 


#if 0

EXPORT_SYMBOL(pnp_register_protocol);

EXPORT_SYMBOL(pnp_unregister_protocol);

EXPORT_SYMBOL(pnp_add_device);

EXPORT_SYMBOL(pnp_remove_device);

#endif /*  0  */

drivers/pnp/driver.c

+9 −11
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
 * driver.c - device id matching, driver model, etc.

 *

 * Copyright 2002 Adam Belay <ambx1@neo.rr.com>

 *

 */



#include <linux/string.h>
@@ -16,6 +15,7 @@ 
static int compare_func(const char *ida, const char *idb)

{

	int i;



	/* we only need to compare the last 4 chars */

	for (i = 3; i < 7; i++) {

		if (ida[i] != 'X' &&
@@ -44,6 +44,7 @@ static const struct pnp_device_id *match_device(struct pnp_driver *drv, 
						struct pnp_dev *dev)

{

	const struct pnp_device_id *drv_id = drv->id_table;



	if (!drv_id)

		return NULL;
@@ -140,6 +141,7 @@ static int pnp_bus_match(struct device *dev, struct device_driver *drv) 
{

	struct pnp_dev *pnp_dev = to_pnp_dev(dev);

	struct pnp_driver *pnp_drv = to_pnp_driver(drv);



	if (match_device(pnp_drv, pnp_dev) == NULL)

		return 0;

	return 1;
@@ -225,12 +227,11 @@ void pnp_unregister_driver(struct pnp_driver *drv) 
 * pnp_add_id - adds an EISA id to the specified device

 * @id: pointer to a pnp_id structure

 * @dev: pointer to the desired device

 *

 */



int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev)

{

	struct pnp_id *ptr;



	if (!id)

		return -EINVAL;

	if (!dev)
@@ -248,8 +249,5 @@ int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev) 


EXPORT_SYMBOL(pnp_register_driver);

EXPORT_SYMBOL(pnp_unregister_driver);

#if 0

EXPORT_SYMBOL(pnp_add_id);

#endif

EXPORT_SYMBOL(pnp_device_attach);

EXPORT_SYMBOL(pnp_device_detach);

drivers/pnp/interface.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
 *

 * Some code, especially possible resource dumping is based on isapnp_proc.c (c) Jaroslav Kysela <perex@suse.cz>

 * Copyright 2002 Adam Belay <ambx1@neo.rr.com>

 *

 */



#include <linux/pnp.h>
@@ -488,6 +487,7 @@ static DEVICE_ATTR(id, S_IRUGO, pnp_show_current_ids, NULL); 
int pnp_interface_attach_device(struct pnp_dev *dev)

{

	int rc = device_create_file(&dev->dev, &dev_attr_options);



	if (rc)

		goto err;

	rc = device_create_file(&dev->dev, &dev_attr_resources);

drivers/pnp/isapnp/compat.c

+12 −11
Original line number Diff line number Diff line
@@ -3,11 +3,8 @@ 
 *            the old isapnp APIs. If possible use the new APIs instead.

 *

 * Copyright 2002 Adam Belay <ambx1@neo.rr.com>

 *

 */



/* TODO: see if more isapnp functions are needed here */



#include <linux/module.h>

#include <linux/isapnp.h>

#include <linux/string.h>
@@ -19,16 +16,17 @@ static void pnp_convert_id(char *buf, unsigned short vendor, 
		'A' + ((vendor >> 2) & 0x3f) - 1,

		'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1,

		'A' + ((vendor >> 8) & 0x1f) - 1,

		(device >> 4) & 0x0f,

		device & 0x0f, (device >> 12) & 0x0f, (device >> 8) & 0x0f);

		(device >> 4) & 0x0f, device & 0x0f,

		(device >> 12) & 0x0f, (device >> 8) & 0x0f);

}



struct pnp_card *pnp_find_card(unsigned short vendor,

			       unsigned short device, struct pnp_card *from)

struct pnp_card *pnp_find_card(unsigned short vendor, unsigned short device,

			       struct pnp_card *from)

{

	char id[8];

	char any[8];

	struct list_head *list;



	pnp_convert_id(id, vendor, device);

	pnp_convert_id(any, ISAPNP_ANY_ID, ISAPNP_ANY_ID);
@@ -36,6 +34,7 @@ struct pnp_card *pnp_find_card(unsigned short vendor, 


	while (list != &pnp_cards) {

		struct pnp_card *card = global_to_pnp_card(list);



		if (compare_pnp_id(card->id, id) || (memcmp(id, any, 7) == 0))

			return card;

		list = list->next;
@@ -43,12 +42,12 @@ struct pnp_card *pnp_find_card(unsigned short vendor, 
	return NULL;

}



struct pnp_dev *pnp_find_dev(struct pnp_card *card,

			     unsigned short vendor,

struct pnp_dev *pnp_find_dev(struct pnp_card *card, unsigned short vendor,

			     unsigned short function, struct pnp_dev *from)

{

	char id[8];

	char any[8];



	pnp_convert_id(id, vendor, function);

	pnp_convert_id(any, ISAPNP_ANY_ID, ISAPNP_ANY_ID);

	if (card == NULL) {	/* look for a logical device from all cards */
@@ -60,8 +59,9 @@ struct pnp_dev *pnp_find_dev(struct pnp_card *card, 


		while (list != &pnp_global) {

			struct pnp_dev *dev = global_to_pnp_dev(list);

			if (compare_pnp_id(dev->id, id)

			    || (memcmp(id, any, 7) == 0))



			if (compare_pnp_id(dev->id, id) ||

			    (memcmp(id, any, 7) == 0))

				return dev;

			list = list->next;

		}
@@ -76,6 +76,7 @@ struct pnp_dev *pnp_find_dev(struct pnp_card *card, 
		}

		while (list != &card->devices) {

			struct pnp_dev *dev = card_to_pnp_dev(list);



			if (compare_pnp_id(dev->id, id))

				return dev;

			list = list->next;