aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/pnpacpi
diff options
context:
space:
mode:
authorThomas Renninger <trenn@suse.de>2008-02-06 04:40:03 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:19 -0500
commit2bb9a6b32f98873adf89a0de04c898681a2c5b8e (patch)
tree1205b9a0873e55db0f8fdff59943f2f9f3782647 /drivers/pnp/pnpacpi
parentcc8259a6666de456460bacdd5637f5e2d71790ea (diff)
pnp: declare PNP option parsing functions as __init
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>
Diffstat (limited to 'drivers/pnp/pnpacpi')
-rw-r--r--drivers/pnp/pnpacpi/rsparser.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 6b9840cce0f4..6aa231ef642d 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -391,8 +391,8 @@ acpi_status pnpacpi_parse_allocated_resource(acpi_handle handle,
391 pnpacpi_allocated_resource, res); 391 pnpacpi_allocated_resource, res);
392} 392}
393 393
394static void pnpacpi_parse_dma_option(struct pnp_option *option, 394static __init void pnpacpi_parse_dma_option(struct pnp_option *option,
395 struct acpi_resource_dma *p) 395 struct acpi_resource_dma *p)
396{ 396{
397 int i; 397 int i;
398 struct pnp_dma *dma; 398 struct pnp_dma *dma;
@@ -411,8 +411,8 @@ static void pnpacpi_parse_dma_option(struct pnp_option *option,
411 pnp_register_dma_resource(option, dma); 411 pnp_register_dma_resource(option, dma);
412} 412}
413 413
414static void pnpacpi_parse_irq_option(struct pnp_option *option, 414static __init void pnpacpi_parse_irq_option(struct pnp_option *option,
415 struct acpi_resource_irq *p) 415 struct acpi_resource_irq *p)
416{ 416{
417 int i; 417 int i;
418 struct pnp_irq *irq; 418 struct pnp_irq *irq;
@@ -431,8 +431,8 @@ static void pnpacpi_parse_irq_option(struct pnp_option *option,
431 pnp_register_irq_resource(option, irq); 431 pnp_register_irq_resource(option, irq);
432} 432}
433 433
434static void pnpacpi_parse_ext_irq_option(struct pnp_option *option, 434static __init void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
435 struct acpi_resource_extended_irq *p) 435 struct acpi_resource_extended_irq *p)
436{ 436{
437 int i; 437 int i;
438 struct pnp_irq *irq; 438 struct pnp_irq *irq;
@@ -451,8 +451,8 @@ static void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
451 pnp_register_irq_resource(option, irq); 451 pnp_register_irq_resource(option, irq);
452} 452}
453 453
454static void pnpacpi_parse_port_option(struct pnp_option *option, 454static __init void pnpacpi_parse_port_option(struct pnp_option *option,
455 struct acpi_resource_io *io) 455 struct acpi_resource_io *io)
456{ 456{
457 struct pnp_port *port; 457 struct pnp_port *port;
458 458
@@ -470,8 +470,8 @@ static void pnpacpi_parse_port_option(struct pnp_option *option,
470 pnp_register_port_resource(option, port); 470 pnp_register_port_resource(option, port);
471} 471}
472 472
473static void pnpacpi_parse_fixed_port_option(struct pnp_option *option, 473static __init void pnpacpi_parse_fixed_port_option(struct pnp_option *option,
474 struct acpi_resource_fixed_io *io) 474 struct acpi_resource_fixed_io *io)
475{ 475{
476 struct pnp_port *port; 476 struct pnp_port *port;
477 477
@@ -487,8 +487,8 @@ static void pnpacpi_parse_fixed_port_option(struct pnp_option *option,
487 pnp_register_port_resource(option, port); 487 pnp_register_port_resource(option, port);
488} 488}
489 489
490static void pnpacpi_parse_mem24_option(struct pnp_option *option, 490static __init void pnpacpi_parse_mem24_option(struct pnp_option *option,
491 struct acpi_resource_memory24 *p) 491 struct acpi_resource_memory24 *p)
492{ 492{
493 struct pnp_mem *mem; 493 struct pnp_mem *mem;
494 494
@@ -508,8 +508,8 @@ static void pnpacpi_parse_mem24_option(struct pnp_option *option,
508 pnp_register_mem_resource(option, mem); 508 pnp_register_mem_resource(option, mem);
509} 509}
510 510
511static void pnpacpi_parse_mem32_option(struct pnp_option *option, 511static __init void pnpacpi_parse_mem32_option(struct pnp_option *option,
512 struct acpi_resource_memory32 *p) 512 struct acpi_resource_memory32 *p)
513{ 513{
514 struct pnp_mem *mem; 514 struct pnp_mem *mem;
515 515
@@ -529,8 +529,8 @@ static void pnpacpi_parse_mem32_option(struct pnp_option *option,
529 pnp_register_mem_resource(option, mem); 529 pnp_register_mem_resource(option, mem);
530} 530}
531 531
532static void pnpacpi_parse_fixed_mem32_option(struct pnp_option *option, 532static __init void pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
533 struct acpi_resource_fixed_memory32 *p) 533 struct acpi_resource_fixed_memory32 *p)
534{ 534{
535 struct pnp_mem *mem; 535 struct pnp_mem *mem;
536 536
@@ -549,8 +549,8 @@ static void pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
549 pnp_register_mem_resource(option, mem); 549 pnp_register_mem_resource(option, mem);
550} 550}
551 551
552static void pnpacpi_parse_address_option(struct pnp_option *option, 552static __init void pnpacpi_parse_address_option(struct pnp_option *option,
553 struct acpi_resource *r) 553 struct acpi_resource *r)
554{ 554{
555 struct acpi_resource_address64 addr, *p = &addr; 555 struct acpi_resource_address64 addr, *p = &addr;
556 acpi_status status; 556 acpi_status status;
@@ -596,8 +596,8 @@ struct acpipnp_parse_option_s {
596 struct pnp_dev *dev; 596 struct pnp_dev *dev;
597}; 597};
598 598
599static acpi_status pnpacpi_option_resource(struct acpi_resource *res, 599static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res,
600 void *data) 600 void *data)
601{ 601{
602 int priority = 0; 602 int priority = 0;
603 struct acpipnp_parse_option_s *parse_data = data; 603 struct acpipnp_parse_option_s *parse_data = data;
@@ -696,8 +696,8 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
696 return AE_OK; 696 return AE_OK;
697} 697}
698 698
699acpi_status pnpacpi_parse_resource_option_data(acpi_handle handle, 699acpi_status __init pnpacpi_parse_resource_option_data(acpi_handle handle,
700 struct pnp_dev * dev) 700 struct pnp_dev *dev)
701{ 701{
702 acpi_status status; 702 acpi_status status;
703 struct acpipnp_parse_option_s parse_data; 703 struct acpipnp_parse_option_s parse_data;