Skip to content

Commit

Permalink
pnp: declare PNP option parsing functions as __init
Browse files Browse the repository at this point in the history 
There are three kind of parse functions provided by PNP acpi/bios:
 - get current resources
 - set resources
 - get possible resources
The first two may be needed later at runtime.
The possible resource settings should never change dynamically.
And even if this would make any sense (I doubt it), the current implementation
only parses possible resource settings at early init time:
  -> declare all the option parsing __init

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Thomas Renninger <trenn@suse.de>
Acked-By: Rene Herman <rene.herman@gmail.com>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Thomas Renninger authored and Linus Torvalds committed Feb 6, 2008
1 parent cc8259a commit 2bb9a6b
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 39 deletions.
44 changes: 22 additions & 22 deletions drivers/pnp/pnpacpi/rsparser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,8 @@ acpi_status pnpacpi_parse_allocated_resource(acpi_handle handle,
pnpacpi_allocated_resource, res);
}

static void pnpacpi_parse_dma_option(struct pnp_option *option,
struct acpi_resource_dma *p)
static __init void pnpacpi_parse_dma_option(struct pnp_option *option,
struct acpi_resource_dma *p)
{
int i;
struct pnp_dma *dma;
Expand All @@ -411,8 +411,8 @@ static void pnpacpi_parse_dma_option(struct pnp_option *option,
pnp_register_dma_resource(option, dma);
}

static void pnpacpi_parse_irq_option(struct pnp_option *option,
struct acpi_resource_irq *p)
static __init void pnpacpi_parse_irq_option(struct pnp_option *option,
struct acpi_resource_irq *p)
{
int i;
struct pnp_irq *irq;
Expand All @@ -431,8 +431,8 @@ static void pnpacpi_parse_irq_option(struct pnp_option *option,
pnp_register_irq_resource(option, irq);
}

static void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
struct acpi_resource_extended_irq *p)
static __init void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
struct acpi_resource_extended_irq *p)
{
int i;
struct pnp_irq *irq;
Expand All @@ -451,8 +451,8 @@ static void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
pnp_register_irq_resource(option, irq);
}

static void pnpacpi_parse_port_option(struct pnp_option *option,
struct acpi_resource_io *io)
static __init void pnpacpi_parse_port_option(struct pnp_option *option,
struct acpi_resource_io *io)
{
struct pnp_port *port;

Expand All @@ -470,8 +470,8 @@ static void pnpacpi_parse_port_option(struct pnp_option *option,
pnp_register_port_resource(option, port);
}

static void pnpacpi_parse_fixed_port_option(struct pnp_option *option,
struct acpi_resource_fixed_io *io)
static __init void pnpacpi_parse_fixed_port_option(struct pnp_option *option,
struct acpi_resource_fixed_io *io)
{
struct pnp_port *port;

Expand All @@ -487,8 +487,8 @@ static void pnpacpi_parse_fixed_port_option(struct pnp_option *option,
pnp_register_port_resource(option, port);
}

static void pnpacpi_parse_mem24_option(struct pnp_option *option,
struct acpi_resource_memory24 *p)
static __init void pnpacpi_parse_mem24_option(struct pnp_option *option,
struct acpi_resource_memory24 *p)
{
struct pnp_mem *mem;

Expand All @@ -508,8 +508,8 @@ static void pnpacpi_parse_mem24_option(struct pnp_option *option,
pnp_register_mem_resource(option, mem);
}

static void pnpacpi_parse_mem32_option(struct pnp_option *option,
struct acpi_resource_memory32 *p)
static __init void pnpacpi_parse_mem32_option(struct pnp_option *option,
struct acpi_resource_memory32 *p)
{
struct pnp_mem *mem;

Expand All @@ -529,8 +529,8 @@ static void pnpacpi_parse_mem32_option(struct pnp_option *option,
pnp_register_mem_resource(option, mem);
}

static void pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
struct acpi_resource_fixed_memory32 *p)
static __init void pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
struct acpi_resource_fixed_memory32 *p)
{
struct pnp_mem *mem;

Expand All @@ -549,8 +549,8 @@ static void pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
pnp_register_mem_resource(option, mem);
}

static void pnpacpi_parse_address_option(struct pnp_option *option,
struct acpi_resource *r)
static __init void pnpacpi_parse_address_option(struct pnp_option *option,
struct acpi_resource *r)
{
struct acpi_resource_address64 addr, *p = &addr;
acpi_status status;
Expand Down Expand Up @@ -596,8 +596,8 @@ struct acpipnp_parse_option_s {
struct pnp_dev *dev;
};

static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
void *data)
static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res,
void *data)
{
int priority = 0;
struct acpipnp_parse_option_s *parse_data = data;
Expand Down Expand Up @@ -696,8 +696,8 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
return AE_OK;
}

acpi_status pnpacpi_parse_resource_option_data(acpi_handle handle,
struct pnp_dev * dev)
acpi_status __init pnpacpi_parse_resource_option_data(acpi_handle handle,
struct pnp_dev *dev)
{
acpi_status status;
struct acpipnp_parse_option_s parse_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/pnp/pnpbios/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ struct pnp_protocol pnpbios_protocol = {
.disable = pnpbios_disable_resources,
};

static int insert_device(struct pnp_bios_node *node)
static int __init insert_device(struct pnp_bios_node *node)
{
struct list_head *pos;
struct pnp_dev *dev;
Expand Down
33 changes: 17 additions & 16 deletions drivers/pnp/pnpbios/rsparser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ static unsigned char *pnpbios_parse_allocated_resource_data(unsigned char *p,
* Resource Configuration Options
*/

static void pnpbios_parse_mem_option(unsigned char *p, int size,
struct pnp_option *option)
static __init void pnpbios_parse_mem_option(unsigned char *p, int size,
struct pnp_option *option)
{
struct pnp_mem *mem;

Expand All @@ -278,8 +278,8 @@ static void pnpbios_parse_mem_option(unsigned char *p, int size,
pnp_register_mem_resource(option, mem);
}

static void pnpbios_parse_mem32_option(unsigned char *p, int size,
struct pnp_option *option)
static __init void pnpbios_parse_mem32_option(unsigned char *p, int size,
struct pnp_option *option)
{
struct pnp_mem *mem;

Expand All @@ -294,8 +294,8 @@ static void pnpbios_parse_mem32_option(unsigned char *p, int size,
pnp_register_mem_resource(option, mem);
}

static void pnpbios_parse_fixed_mem32_option(unsigned char *p, int size,
struct pnp_option *option)
static __init void pnpbios_parse_fixed_mem32_option(unsigned char *p, int size,
struct pnp_option *option)
{
struct pnp_mem *mem;

Expand All @@ -309,7 +309,7 @@ static void pnpbios_parse_fixed_mem32_option(unsigned char *p, int size,
pnp_register_mem_resource(option, mem);
}

static void pnpbios_parse_irq_option(unsigned char *p, int size,
static __init void pnpbios_parse_irq_option(unsigned char *p, int size,
struct pnp_option *option)
{
struct pnp_irq *irq;
Expand All @@ -327,7 +327,7 @@ static void pnpbios_parse_irq_option(unsigned char *p, int size,
pnp_register_irq_resource(option, irq);
}

static void pnpbios_parse_dma_option(unsigned char *p, int size,
static __init void pnpbios_parse_dma_option(unsigned char *p, int size,
struct pnp_option *option)
{
struct pnp_dma *dma;
Expand All @@ -340,8 +340,8 @@ static void pnpbios_parse_dma_option(unsigned char *p, int size,
pnp_register_dma_resource(option, dma);
}

static void pnpbios_parse_port_option(unsigned char *p, int size,
struct pnp_option *option)
static __init void pnpbios_parse_port_option(unsigned char *p, int size,
struct pnp_option *option)
{
struct pnp_port *port;

Expand All @@ -356,8 +356,8 @@ static void pnpbios_parse_port_option(unsigned char *p, int size,
pnp_register_port_resource(option, port);
}

static void pnpbios_parse_fixed_port_option(unsigned char *p, int size,
struct pnp_option *option)
static __init void pnpbios_parse_fixed_port_option(unsigned char *p, int size,
struct pnp_option *option)
{
struct pnp_port *port;

Expand All @@ -371,9 +371,9 @@ static void pnpbios_parse_fixed_port_option(unsigned char *p, int size,
pnp_register_port_resource(option, port);
}

static unsigned char *pnpbios_parse_resource_option_data(unsigned char *p,
unsigned char *end,
struct pnp_dev *dev)
static __init unsigned char *
pnpbios_parse_resource_option_data(unsigned char *p, unsigned char *end,
struct pnp_dev *dev)
{
unsigned int len, tag;
int priority = 0;
Expand Down Expand Up @@ -781,7 +781,8 @@ static unsigned char *pnpbios_encode_allocated_resource_data(unsigned char *p,
* Core Parsing Functions
*/

int pnpbios_parse_data_stream(struct pnp_dev *dev, struct pnp_bios_node *node)
int __init pnpbios_parse_data_stream(struct pnp_dev *dev,
struct pnp_bios_node *node)
{
unsigned char *p = (char *)node->data;
unsigned char *end = (char *)(node->data + node->size);
Expand Down

0 comments on commit 2bb9a6b

Please sign in to comment.