pnp: add pnp_build_option() to the API

Rene Herman · torvalds · commit bc033c9b5fd2 · 2008-05-14T19:11:13.000-07:00
The subsequent AD181x quirk patch would like this as part of the API.
pnp_register_dependent_option() adds to the same dependent chain the quirk is
walking which is fairly unclean.  This enables a private option chain build
which it can then just add onto the end when done.

Signed-off-by: Rene Herman &lt;rene.herman@gmail.com&gt;
Tested-by: Uwe Bugla &lt;uwe.bugla@gmx.de&gt;
Acked-by: Uwe Bugla &lt;uwe.bugla@gmx.de&gt;
Acked-by: Bjorn Helgaas &lt;bjorn.helgaas@hp.com&gt;
Cc: Takashi Iwai &lt;tiwai@suse.de&gt;
Cc: Len Brown &lt;len.brown@intel.com
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
@@ -19,6 +19,7 @@ void pnp_remove_card(struct pnp_card *card);
 int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev);
 void pnp_remove_card_device(struct pnp_dev *dev);
 
+struct pnp_option *pnp_build_option(int priority);
 struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev);
 struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
 						 int priority);
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
@@ -28,7 +28,7 @@ static int pnp_reserve_mem[16] = {[0 ... 15] = -1 };	/* reserve (don't use) some
  * option registration
  */
 
-static struct pnp_option *pnp_build_option(int priority)
+struct pnp_option *pnp_build_option(int priority)
 {
 	struct pnp_option *option = pnp_alloc(sizeof(struct pnp_option));
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ static int pnp_reserve_mem[16] = {[0 ... 15] = -1 }; /* reserve (don't use) some`
`28`	`28`	`* option registration`
`29`	`29`	`*/`
`30`	`30`
`31`		`-static struct pnp_option *pnp_build_option(int priority)`
	`31`	`+struct pnp_option *pnp_build_option(int priority)`
`32`	`32`	`{`
`33`	`33`	`struct pnp_option *option = pnp_alloc(sizeof(struct pnp_option));`
`34`	`34`