From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: Kay Sievers <kay.sievers@vrfy.org>, Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 15/15] pnp: fix "add acpi:* modalias entries"
Date: Thu, 21 Aug 2008 10:33:03 -0700 [thread overview]
Message-ID: <1219339983-9634-15-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20080821173036.GB7974@suse.de>
From: Kay Sievers <kay.sievers@vrfy.org>
With 22454cb99fc39f2629ad06a7eccb3df312f8830e we added only the
first entry of the device table. We need to loop over the whole
device list.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
scripts/mod/file2alias.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 4fa1f3a..4c9890e 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -344,14 +344,20 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
struct module *mod)
{
const unsigned long id_size = sizeof(struct pnp_device_id);
- const struct pnp_device_id *id = symval;
+ const unsigned int count = (size / id_size)-1;
+ const struct pnp_device_id *devs = symval;
+ unsigned int i;
device_id_check(mod->name, "pnp", size, id_size, symval);
- buf_printf(&mod->dev_table_buf,
- "MODULE_ALIAS(\"pnp:d%s*\");\n", id->id);
- buf_printf(&mod->dev_table_buf,
- "MODULE_ALIAS(\"acpi*:%s:*\");\n", id->id);
+ for (i = 0; i < count; i++) {
+ const char *id = (char *)devs[i].id;
+
+ buf_printf(&mod->dev_table_buf,
+ "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
+ buf_printf(&mod->dev_table_buf,
+ "MODULE_ALIAS(\"acpi*:%s:*\");\n", id);
+ }
}
/* looks like: "pnp:dD" for every device of the card */
--
1.5.6.5
prev parent reply other threads:[~2008-08-21 17:42 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-21 17:30 [GIT PATCH] driver core patches against 2.6.26-rc4 Greg KH
2008-08-21 17:32 ` [PATCH 01/15] kobject: Replace ALL occurrences of '/' with '!' instead of only the first one Greg Kroah-Hartman
2008-08-22 12:41 ` Ville Syrjälä
2008-08-23 2:14 ` Greg KH
2008-08-21 17:32 ` [PATCH 02/15] Japanese translation of Documentation/SubmitChecklist Greg Kroah-Hartman
2008-08-21 17:32 ` [PATCH 03/15] Documentation: HOWTO-ja_JP-sync patch Greg Kroah-Hartman
2008-08-21 17:32 ` [PATCH 04/15] drivers/base/driver.c: remove unused to_dev() macro Greg Kroah-Hartman
2008-08-21 17:32 ` [PATCH 05/15] dev_printk(): constify the `dev' argument Greg Kroah-Hartman
2008-08-21 17:32 ` [PATCH 06/15] driver model: anti-oopsing medicine Greg Kroah-Hartman
2008-08-21 18:24 ` David Brownell
2008-08-21 20:04 ` Greg KH
2008-08-21 17:32 ` [PATCH 07/15] PM: don't skip device PM init when CONFIG_PM_SLEEP isn't set and CONFIG_PM is set Greg Kroah-Hartman
2008-08-21 17:32 ` [PATCH 08/15] driver core: add init_name to struct device Greg Kroah-Hartman
2008-08-21 17:32 ` [PATCH 09/15] PM: Remove WARN_ON from device_pm_add Greg Kroah-Hartman
2008-08-21 17:32 ` [PATCH 10/15] block: fix partial read() of /proc/{partitions,diskstats} Greg Kroah-Hartman
2008-08-21 17:32 ` [PATCH 11/15] block: drop references taken by class_find_device() Greg Kroah-Hartman
2008-08-21 17:33 ` [PATCH 12/15] UIO: uio_pdrv: fix memory leak Greg Kroah-Hartman
2008-08-21 17:33 ` [PATCH 13/15] UIO: uio_pdrv: fix license specification Greg Kroah-Hartman
2008-08-21 17:33 ` [PATCH 14/15] UIO: generic irq handling for some uio platform devices Greg Kroah-Hartman
2008-08-21 17:33 ` Greg Kroah-Hartman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1219339983-9634-15-git-send-email-gregkh@suse.de \
--to=gregkh@suse.de \
--cc=kay.sievers@vrfy.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome