2005-04-16 15:20:36 -07:00
|
|
|
/*
|
|
|
|
* core.c - contains all core device and protocol registration functions
|
|
|
|
*
|
|
|
|
* Copyright 2002 Adam Belay <ambx1@neo.rr.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/pnp.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/list.h>
|
|
|
|
#include <linux/device.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/errno.h>
|
2007-05-08 00:25:29 -07:00
|
|
|
#include <linux/dma-mapping.h>
|
2005-04-16 15:20:36 -07:00
|
|
|
|
|
|
|
#include "base.h"
|
|
|
|
|
|
|
|
static LIST_HEAD(pnp_protocols);
|
|
|
|
LIST_HEAD(pnp_global);
|
|
|
|
DEFINE_SPINLOCK(pnp_lock);
|
|
|
|
|
2007-05-08 00:35:54 -07:00
|
|
|
/*
|
|
|
|
* ACPI or PNPBIOS should tell us about all platform devices, so we can
|
|
|
|
* skip some blind probes. ISAPNP typically enumerates only plug-in ISA
|
|
|
|
* devices, not built-in things like COM ports.
|
|
|
|
*/
|
|
|
|
int pnp_platform_devices;
|
|
|
|
EXPORT_SYMBOL(pnp_platform_devices);
|
|
|
|
|
2005-04-16 15:20:36 -07:00
|
|
|
void *pnp_alloc(long size)
|
|
|
|
{
|
|
|
|
void *result;
|
|
|
|
|
some kmalloc/memset ->kzalloc (tree wide)
Transform some calls to kmalloc/memset to a single kzalloc (or kcalloc).
Here is a short excerpt of the semantic patch performing
this transformation:
@@
type T2;
expression x;
identifier f,fld;
expression E;
expression E1,E2;
expression e1,e2,e3,y;
statement S;
@@
x =
- kmalloc
+ kzalloc
(E1,E2)
... when != \(x->fld=E;\|y=f(...,x,...);\|f(...,x,...);\|x=E;\|while(...) S\|for(e1;e2;e3) S\)
- memset((T2)x,0,E1);
@@
expression E1,E2,E3;
@@
- kzalloc(E1 * E2,E3)
+ kcalloc(E1,E2,E3)
[akpm@linux-foundation.org: get kcalloc args the right way around]
Signed-off-by: Yoann Padioleau <padator@wanadoo.fr>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Acked-by: Russell King <rmk@arm.linux.org.uk>
Cc: Bryan Wu <bryan.wu@analog.com>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Dave Airlie <airlied@linux.ie>
Acked-by: Roland Dreier <rolandd@cisco.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Acked-by: Pierre Ossman <drzeus-list@drzeus.cx>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: "David S. Miller" <davem@davemloft.net>
Acked-by: Greg KH <greg@kroah.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-07-19 01:49:03 -07:00
|
|
|
result = kzalloc(size, GFP_KERNEL);
|
2007-07-26 10:41:20 -07:00
|
|
|
if (!result) {
|
2005-04-16 15:20:36 -07:00
|
|
|
printk(KERN_ERR "pnp: Out of Memory\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* pnp_protocol_register - adds a pnp protocol to the pnp layer
|
|
|
|
* @protocol: pointer to the corresponding pnp_protocol structure
|
|
|
|
*
|
|
|
|
* Ex protocols: ISAPNP, PNPBIOS, etc
|
|
|
|
*/
|
|
|
|
int pnp_register_protocol(struct pnp_protocol *protocol)
|
|
|
|
{
|
|
|
|
int nodenum;
|
2007-07-26 10:41:20 -07:00
|
|
|
struct list_head *pos;
|
2005-04-16 15:20:36 -07:00
|
|
|
|
|
|
|
INIT_LIST_HEAD(&protocol->devices);
|
|
|
|
INIT_LIST_HEAD(&protocol->cards);
|
|
|
|
nodenum = 0;
|
|
|
|
spin_lock(&pnp_lock);
|
|
|
|
|
|
|
|
/* assign the lowest unused number */
|
2007-07-26 10:41:20 -07:00
|
|
|
list_for_each(pos, &pnp_protocols) {
|
|
|
|
struct pnp_protocol *cur = to_pnp_protocol(pos);
|
|
|
|
if (cur->number == nodenum) {
|
2005-04-16 15:20:36 -07:00
|
|
|
pos = &pnp_protocols;
|
|
|
|
nodenum++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
list_add_tail(&protocol->protocol_list, &pnp_protocols);
|
|
|
|
spin_unlock(&pnp_lock);
|
|
|
|
|
|
|
|
protocol->number = nodenum;
|
2009-01-06 11:44:38 -07:00
|
|
|
dev_set_name(&protocol->dev, "pnp%d", nodenum);
|
2005-04-16 15:20:36 -07:00
|
|
|
return device_register(&protocol->dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* 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)
|
|
|
|
{
|
|
|
|
spin_lock(&pnp_lock);
|
|
|
|
list_del(&protocol->protocol_list);
|
|
|
|
spin_unlock(&pnp_lock);
|
|
|
|
device_unregister(&protocol->dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void pnp_free_ids(struct pnp_dev *dev)
|
|
|
|
{
|
2007-07-26 10:41:20 -07:00
|
|
|
struct pnp_id *id;
|
|
|
|
struct pnp_id *next;
|
2007-07-26 10:41:21 -07:00
|
|
|
|
2005-04-16 15:20:36 -07:00
|
|
|
id = dev->id;
|
|
|
|
while (id) {
|
|
|
|
next = id->next;
|
|
|
|
kfree(id);
|
|
|
|
id = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
PNP: replace pnp_resource_table with dynamically allocated resources
PNP used to have a fixed-size pnp_resource_table for tracking the
resources used by a device. This table often overflowed, so we've
had to increase the table size, which wastes memory because most
devices have very few resources.
This patch replaces the table with a linked list of resources where
the entries are allocated on demand.
This removes messages like these:
pnpacpi: exceeded the max number of IO resources
00:01: too many I/O port resources
References:
http://bugzilla.kernel.org/show_bug.cgi?id=9535
http://bugzilla.kernel.org/show_bug.cgi?id=9740
http://lkml.org/lkml/2007/11/30/110
This patch also changes the way PNP uses the IORESOURCE_UNSET,
IORESOURCE_AUTO, and IORESOURCE_DISABLED flags.
Prior to this patch, the pnp_resource_table entries used the flags
like this:
IORESOURCE_UNSET
This table entry is unused and available for use. When this flag
is set, we shouldn't look at anything else in the resource structure.
This flag is set when a resource table entry is initialized.
IORESOURCE_AUTO
This resource was assigned automatically by pnp_assign_{io,mem,etc}().
This flag is set when a resource table entry is initialized and
cleared whenever we discover a resource setting by reading an ISAPNP
config register, parsing a PNPBIOS resource data stream, parsing an
ACPI _CRS list, or interpreting a sysfs "set" command.
Resources marked IORESOURCE_AUTO are reinitialized and marked as
IORESOURCE_UNSET by pnp_clean_resource_table() in these cases:
- before we attempt to assign resources automatically,
- if we fail to assign resources automatically,
- after disabling a device
IORESOURCE_DISABLED
Set by pnp_assign_{io,mem,etc}() when automatic assignment fails.
Also set by PNPBIOS and PNPACPI for:
- invalid IRQs or GSI registration failures
- invalid DMA channels
- I/O ports above 0x10000
- mem ranges with negative length
After this patch, there is no pnp_resource_table, and the resource list
entries use the flags like this:
IORESOURCE_UNSET
This flag is no longer used in PNP. Instead of keeping
IORESOURCE_UNSET entries in the resource list, we remove
entries from the list and free them.
IORESOURCE_AUTO
No change in meaning: it still means the resource was assigned
automatically by pnp_assign_{port,mem,etc}(), but these functions
now set the bit explicitly.
We still "clean" a device's resource list in the same places,
but rather than reinitializing IORESOURCE_AUTO entries, we
just remove them from the list.
Note that IORESOURCE_AUTO entries are always at the end of the
list, so removing them doesn't reorder other list entries.
This is because non-IORESOURCE_AUTO entries are added by the
ISAPNP, PNPBIOS, or PNPACPI "get resources" methods and by the
sysfs "set" command. In each of these cases, we completely free
the resource list first.
IORESOURCE_DISABLED
In addition to the cases where we used to set this flag, ISAPNP now
adds an IORESOURCE_DISABLED resource when it reads a configuration
register with a "disabled" value.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
2008-06-27 15:56:57 -07:00
|
|
|
void pnp_free_resource(struct pnp_resource *pnp_res)
|
|
|
|
{
|
|
|
|
list_del(&pnp_res->list);
|
|
|
|
kfree(pnp_res);
|
|
|
|
}
|
|
|
|
|
|
|
|
void pnp_free_resources(struct pnp_dev *dev)
|
|
|
|
{
|
|
|
|
struct pnp_resource *pnp_res, *tmp;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(pnp_res, tmp, &dev->resources, list) {
|
|
|
|
pnp_free_resource(pnp_res);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-04-16 15:20:36 -07:00
|
|
|
static void pnp_release_device(struct device *dmdev)
|
|
|
|
{
|
2007-07-26 10:41:20 -07:00
|
|
|
struct pnp_dev *dev = to_pnp_dev(dmdev);
|
2007-07-26 10:41:21 -07:00
|
|
|
|
2005-04-16 15:20:36 -07:00
|
|
|
pnp_free_ids(dev);
|
PNP: replace pnp_resource_table with dynamically allocated resources
PNP used to have a fixed-size pnp_resource_table for tracking the
resources used by a device. This table often overflowed, so we've
had to increase the table size, which wastes memory because most
devices have very few resources.
This patch replaces the table with a linked list of resources where
the entries are allocated on demand.
This removes messages like these:
pnpacpi: exceeded the max number of IO resources
00:01: too many I/O port resources
References:
http://bugzilla.kernel.org/show_bug.cgi?id=9535
http://bugzilla.kernel.org/show_bug.cgi?id=9740
http://lkml.org/lkml/2007/11/30/110
This patch also changes the way PNP uses the IORESOURCE_UNSET,
IORESOURCE_AUTO, and IORESOURCE_DISABLED flags.
Prior to this patch, the pnp_resource_table entries used the flags
like this:
IORESOURCE_UNSET
This table entry is unused and available for use. When this flag
is set, we shouldn't look at anything else in the resource structure.
This flag is set when a resource table entry is initialized.
IORESOURCE_AUTO
This resource was assigned automatically by pnp_assign_{io,mem,etc}().
This flag is set when a resource table entry is initialized and
cleared whenever we discover a resource setting by reading an ISAPNP
config register, parsing a PNPBIOS resource data stream, parsing an
ACPI _CRS list, or interpreting a sysfs "set" command.
Resources marked IORESOURCE_AUTO are reinitialized and marked as
IORESOURCE_UNSET by pnp_clean_resource_table() in these cases:
- before we attempt to assign resources automatically,
- if we fail to assign resources automatically,
- after disabling a device
IORESOURCE_DISABLED
Set by pnp_assign_{io,mem,etc}() when automatic assignment fails.
Also set by PNPBIOS and PNPACPI for:
- invalid IRQs or GSI registration failures
- invalid DMA channels
- I/O ports above 0x10000
- mem ranges with negative length
After this patch, there is no pnp_resource_table, and the resource list
entries use the flags like this:
IORESOURCE_UNSET
This flag is no longer used in PNP. Instead of keeping
IORESOURCE_UNSET entries in the resource list, we remove
entries from the list and free them.
IORESOURCE_AUTO
No change in meaning: it still means the resource was assigned
automatically by pnp_assign_{port,mem,etc}(), but these functions
now set the bit explicitly.
We still "clean" a device's resource list in the same places,
but rather than reinitializing IORESOURCE_AUTO entries, we
just remove them from the list.
Note that IORESOURCE_AUTO entries are always at the end of the
list, so removing them doesn't reorder other list entries.
This is because non-IORESOURCE_AUTO entries are added by the
ISAPNP, PNPBIOS, or PNPACPI "get resources" methods and by the
sysfs "set" command. In each of these cases, we completely free
the resource list first.
IORESOURCE_DISABLED
In addition to the cases where we used to set this flag, ISAPNP now
adds an IORESOURCE_DISABLED resource when it reads a configuration
register with a "disabled" value.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
2008-06-27 15:56:57 -07:00
|
|
|
pnp_free_resources(dev);
|
PNP: convert resource options to single linked list
ISAPNP, PNPBIOS, and ACPI describe the "possible resource settings" of
a device, i.e., the possibilities an OS bus driver has when it assigns
I/O port, MMIO, and other resources to the device.
PNP used to maintain this "possible resource setting" information in
one independent option structure and a list of dependent option
structures for each device. Each of these option structures had lists
of I/O, memory, IRQ, and DMA resources, for example:
dev
independent options
ind-io0 -> ind-io1 ...
ind-mem0 -> ind-mem1 ...
...
dependent option set 0
dep0-io0 -> dep0-io1 ...
dep0-mem0 -> dep0-mem1 ...
...
dependent option set 1
dep1-io0 -> dep1-io1 ...
dep1-mem0 -> dep1-mem1 ...
...
...
This data structure was designed for ISAPNP, where the OS configures
device resource settings by writing directly to configuration
registers. The OS can write the registers in arbitrary order much
like it writes PCI BARs.
However, for PNPBIOS and ACPI devices, the OS uses firmware interfaces
that perform device configuration, and it is important to pass the
desired settings to those interfaces in the correct order. The OS
learns the correct order by using firmware interfaces that return the
"current resource settings" and "possible resource settings," but the
option structures above doesn't store the ordering information.
This patch replaces the independent and dependent lists with a single
list of options. For example, a device might have possible resource
settings like this:
dev
options
ind-io0 -> dep0-io0 -> dep1->io0 -> ind-io1 ...
All the possible settings are in the same list, in the order they
come from the firmware "possible resource settings" list. Each entry
is tagged with an independent/dependent flag. Dependent entries also
have a "set number" and an optional priority value. All dependent
entries must be assigned from the same set. For example, the OS can
use all the entries from dependent set 0, or all the entries from
dependent set 1, but it cannot mix entries from set 0 with entries
from set 1.
Prior to this patch PNP didn't keep track of the order of this list,
and it assigned all independent options first, then all dependent
ones. Using the example above, that resulted in a "desired
configuration" list like this:
ind->io0 -> ind->io1 -> depN-io0 ...
instead of the list the firmware expects, which looks like this:
ind->io0 -> depN-io0 -> ind-io1 ...
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
2008-06-27 15:57:17 -07:00
|
|
|
pnp_free_options(dev);
|
2005-04-16 15:20:36 -07:00
|
|
|
kfree(dev);
|
|
|
|
}
|
|
|
|
|
2008-04-28 15:33:54 -07:00
|
|
|
struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid)
|
2005-04-16 15:20:36 -07:00
|
|
|
{
|
2008-04-28 15:33:54 -07:00
|
|
|
struct pnp_dev *dev;
|
|
|
|
struct pnp_id *dev_id;
|
2007-07-26 10:41:21 -07:00
|
|
|
|
2008-04-28 15:33:54 -07:00
|
|
|
dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);
|
|
|
|
if (!dev)
|
|
|
|
return NULL;
|
|
|
|
|
PNP: replace pnp_resource_table with dynamically allocated resources
PNP used to have a fixed-size pnp_resource_table for tracking the
resources used by a device. This table often overflowed, so we've
had to increase the table size, which wastes memory because most
devices have very few resources.
This patch replaces the table with a linked list of resources where
the entries are allocated on demand.
This removes messages like these:
pnpacpi: exceeded the max number of IO resources
00:01: too many I/O port resources
References:
http://bugzilla.kernel.org/show_bug.cgi?id=9535
http://bugzilla.kernel.org/show_bug.cgi?id=9740
http://lkml.org/lkml/2007/11/30/110
This patch also changes the way PNP uses the IORESOURCE_UNSET,
IORESOURCE_AUTO, and IORESOURCE_DISABLED flags.
Prior to this patch, the pnp_resource_table entries used the flags
like this:
IORESOURCE_UNSET
This table entry is unused and available for use. When this flag
is set, we shouldn't look at anything else in the resource structure.
This flag is set when a resource table entry is initialized.
IORESOURCE_AUTO
This resource was assigned automatically by pnp_assign_{io,mem,etc}().
This flag is set when a resource table entry is initialized and
cleared whenever we discover a resource setting by reading an ISAPNP
config register, parsing a PNPBIOS resource data stream, parsing an
ACPI _CRS list, or interpreting a sysfs "set" command.
Resources marked IORESOURCE_AUTO are reinitialized and marked as
IORESOURCE_UNSET by pnp_clean_resource_table() in these cases:
- before we attempt to assign resources automatically,
- if we fail to assign resources automatically,
- after disabling a device
IORESOURCE_DISABLED
Set by pnp_assign_{io,mem,etc}() when automatic assignment fails.
Also set by PNPBIOS and PNPACPI for:
- invalid IRQs or GSI registration failures
- invalid DMA channels
- I/O ports above 0x10000
- mem ranges with negative length
After this patch, there is no pnp_resource_table, and the resource list
entries use the flags like this:
IORESOURCE_UNSET
This flag is no longer used in PNP. Instead of keeping
IORESOURCE_UNSET entries in the resource list, we remove
entries from the list and free them.
IORESOURCE_AUTO
No change in meaning: it still means the resource was assigned
automatically by pnp_assign_{port,mem,etc}(), but these functions
now set the bit explicitly.
We still "clean" a device's resource list in the same places,
but rather than reinitializing IORESOURCE_AUTO entries, we
just remove them from the list.
Note that IORESOURCE_AUTO entries are always at the end of the
list, so removing them doesn't reorder other list entries.
This is because non-IORESOURCE_AUTO entries are added by the
ISAPNP, PNPBIOS, or PNPACPI "get resources" methods and by the
sysfs "set" command. In each of these cases, we completely free
the resource list first.
IORESOURCE_DISABLED
In addition to the cases where we used to set this flag, ISAPNP now
adds an IORESOURCE_DISABLED resource when it reads a configuration
register with a "disabled" value.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
2008-06-27 15:56:57 -07:00
|
|
|
INIT_LIST_HEAD(&dev->resources);
|
PNP: convert resource options to single linked list
ISAPNP, PNPBIOS, and ACPI describe the "possible resource settings" of
a device, i.e., the possibilities an OS bus driver has when it assigns
I/O port, MMIO, and other resources to the device.
PNP used to maintain this "possible resource setting" information in
one independent option structure and a list of dependent option
structures for each device. Each of these option structures had lists
of I/O, memory, IRQ, and DMA resources, for example:
dev
independent options
ind-io0 -> ind-io1 ...
ind-mem0 -> ind-mem1 ...
...
dependent option set 0
dep0-io0 -> dep0-io1 ...
dep0-mem0 -> dep0-mem1 ...
...
dependent option set 1
dep1-io0 -> dep1-io1 ...
dep1-mem0 -> dep1-mem1 ...
...
...
This data structure was designed for ISAPNP, where the OS configures
device resource settings by writing directly to configuration
registers. The OS can write the registers in arbitrary order much
like it writes PCI BARs.
However, for PNPBIOS and ACPI devices, the OS uses firmware interfaces
that perform device configuration, and it is important to pass the
desired settings to those interfaces in the correct order. The OS
learns the correct order by using firmware interfaces that return the
"current resource settings" and "possible resource settings," but the
option structures above doesn't store the ordering information.
This patch replaces the independent and dependent lists with a single
list of options. For example, a device might have possible resource
settings like this:
dev
options
ind-io0 -> dep0-io0 -> dep1->io0 -> ind-io1 ...
All the possible settings are in the same list, in the order they
come from the firmware "possible resource settings" list. Each entry
is tagged with an independent/dependent flag. Dependent entries also
have a "set number" and an optional priority value. All dependent
entries must be assigned from the same set. For example, the OS can
use all the entries from dependent set 0, or all the entries from
dependent set 1, but it cannot mix entries from set 0 with entries
from set 1.
Prior to this patch PNP didn't keep track of the order of this list,
and it assigned all independent options first, then all dependent
ones. Using the example above, that resulted in a "desired
configuration" list like this:
ind->io0 -> ind->io1 -> depN-io0 ...
instead of the list the firmware expects, which looks like this:
ind->io0 -> depN-io0 -> ind-io1 ...
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
2008-06-27 15:57:17 -07:00
|
|
|
INIT_LIST_HEAD(&dev->options);
|
2008-04-28 15:33:54 -07:00
|
|
|
dev->protocol = protocol;
|
|
|
|
dev->number = id;
|
2009-04-06 19:01:18 -07:00
|
|
|
dev->dma_mask = DMA_BIT_MASK(24);
|
2008-04-28 15:33:54 -07:00
|
|
|
|
|
|
|
dev->dev.parent = &dev->protocol->dev;
|
2005-04-16 15:20:36 -07:00
|
|
|
dev->dev.bus = &pnp_bus_type;
|
2007-05-08 00:25:29 -07:00
|
|
|
dev->dev.dma_mask = &dev->dma_mask;
|
2008-04-28 15:33:54 -07:00
|
|
|
dev->dev.coherent_dma_mask = dev->dma_mask;
|
2005-04-16 15:20:36 -07:00
|
|
|
dev->dev.release = &pnp_release_device;
|
2008-04-28 15:33:54 -07:00
|
|
|
|
2009-01-06 11:44:38 -07:00
|
|
|
dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number);
|
2008-04-28 15:33:54 -07:00
|
|
|
|
|
|
|
dev_id = pnp_add_id(dev, pnpid);
|
|
|
|
if (!dev_id) {
|
|
|
|
kfree(dev);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return dev;
|
|
|
|
}
|
|
|
|
|
|
|
|
int __pnp_add_device(struct pnp_dev *dev)
|
|
|
|
{
|
|
|
|
pnp_fixup_device(dev);
|
2005-04-16 15:20:36 -07:00
|
|
|
dev->status = PNP_READY;
|
|
|
|
spin_lock(&pnp_lock);
|
|
|
|
list_add_tail(&dev->global_list, &pnp_global);
|
|
|
|
list_add_tail(&dev->protocol_list, &dev->protocol->devices);
|
|
|
|
spin_unlock(&pnp_lock);
|
2008-09-27 16:31:35 -07:00
|
|
|
return device_register(&dev->dev);
|
2005-04-16 15:20:36 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* pnp_add_device - adds a pnp device to the pnp layer
|
|
|
|
* @dev: pointer to dev to add
|
|
|
|
*
|
|
|
|
* adds to driver model, name database, fixups, interface, etc.
|
|
|
|
*/
|
|
|
|
int pnp_add_device(struct pnp_dev *dev)
|
|
|
|
{
|
2007-10-16 23:31:12 -07:00
|
|
|
int ret;
|
2008-08-19 15:53:36 -07:00
|
|
|
char buf[128];
|
|
|
|
int len = 0;
|
|
|
|
struct pnp_id *id;
|
2007-10-16 23:31:12 -07:00
|
|
|
|
2007-08-15 09:32:13 -07:00
|
|
|
if (dev->card)
|
2005-04-16 15:20:36 -07:00
|
|
|
return -EINVAL;
|
2007-10-16 23:31:12 -07:00
|
|
|
|
|
|
|
ret = __pnp_add_device(dev);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2008-08-19 15:53:36 -07:00
|
|
|
buf[0] = '\0';
|
|
|
|
for (id = dev->id; id; id = id->next)
|
|
|
|
len += scnprintf(buf + len, sizeof(buf) - len, " %s", id->id);
|
2007-10-16 23:31:12 -07:00
|
|
|
|
2008-08-19 15:53:47 -07:00
|
|
|
pnp_dbg(&dev->dev, "%s device, IDs%s (%s)\n",
|
2008-08-19 15:53:36 -07:00
|
|
|
dev->protocol->name, buf, dev->active ? "active" : "disabled");
|
2007-10-16 23:31:12 -07:00
|
|
|
return 0;
|
2005-04-16 15:20:36 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void __pnp_remove_device(struct pnp_dev *dev)
|
|
|
|
{
|
|
|
|
spin_lock(&pnp_lock);
|
|
|
|
list_del(&dev->global_list);
|
|
|
|
list_del(&dev->protocol_list);
|
|
|
|
spin_unlock(&pnp_lock);
|
|
|
|
device_unregister(&dev->dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init pnp_init(void)
|
|
|
|
{
|
|
|
|
return bus_register(&pnp_bus_type);
|
|
|
|
}
|
|
|
|
|
|
|
|
subsys_initcall(pnp_init);
|
2008-08-19 15:53:41 -07:00
|
|
|
|
|
|
|
int pnp_debug;
|
|
|
|
|
|
|
|
#if defined(CONFIG_PNP_DEBUG_MESSAGES)
|
|
|
|
static int __init pnp_debug_setup(char *__unused)
|
|
|
|
{
|
|
|
|
pnp_debug = 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
__setup("pnp.debug", pnp_debug_setup);
|
|
|
|
#endif
|