| Message ID | 1297695861-28699-2-git-send-email-colin.king@canonical.com |
|---|---|
| State | Accepted |
| Commit | 72f11b5e02c17b3fc40f5a94138eebdc079d5fd1 |
| Headers | show |
On 02/14/2011 08:04 AM, Colin King wrote: > From: Colin Ian King<colin.king@canonical.com> > > The driver originally used a workaround to load the All-In-One > module based on a Dell DMI module alias. Since the WMI sys interface > supports the WMI GUIDs listed in the driver we can remove this > unneccessary work around. Also, fix GUIDs to have no lower case hex > characters. > > http://bugs.launchpad.net/bugs/718775 > > Signed-off-by: Colin Ian King<colin.king@canonical.com> > --- > drivers/platform/x86/dell-wmi-aio.c | 6 +----- > 1 files changed, 1 insertions(+), 5 deletions(-) > > diff --git a/drivers/platform/x86/dell-wmi-aio.c b/drivers/platform/x86/dell-wmi-aio.c > index 755c6d2..3dccbaa 100644 > --- a/drivers/platform/x86/dell-wmi-aio.c > +++ b/drivers/platform/x86/dell-wmi-aio.c > @@ -32,7 +32,7 @@ MODULE_DESCRIPTION("WMI hotkeys driver for Dell All-In-One series"); > MODULE_LICENSE("GPL"); > > #define EVENT_GUID1 "284A0E6B-380E-472A-921F-E52786257FB4" > -#define EVENT_GUID2 "02314822-307C-4F66-bf0E-48AEAEB26CC8" > +#define EVENT_GUID2 "02314822-307C-4F66-BF0E-48AEAEB26CC8" > > static char *dell_wmi_aio_guids[] = { > EVENT_GUID1, > @@ -40,10 +40,6 @@ static char *dell_wmi_aio_guids[] = { > NULL > }; > > -/* Temporary workaround until the WMI sysfs interface goes in. > - Borrowed from acer-wmi */ > -MODULE_ALIAS("dmi:*:*Dell*:*:"); > - > MODULE_ALIAS("wmi:"EVENT_GUID1); > MODULE_ALIAS("wmi:"EVENT_GUID2); > Acked-by: Tim Gardner <tim.gardner@canonical.com> applied to Natty.
On 02/14/2011 07:04 AM, Colin King wrote: > From: Colin Ian King<colin.king@canonical.com> > > The driver originally used a workaround to load the All-In-One > module based on a Dell DMI module alias. Since the WMI sys interface > supports the WMI GUIDs listed in the driver we can remove this > unneccessary work around. Also, fix GUIDs to have no lower case hex > characters. > > http://bugs.launchpad.net/bugs/718775 > > Signed-off-by: Colin Ian King<colin.king@canonical.com> > --- > drivers/platform/x86/dell-wmi-aio.c | 6 +----- > 1 files changed, 1 insertions(+), 5 deletions(-) > > diff --git a/drivers/platform/x86/dell-wmi-aio.c b/drivers/platform/x86/dell-wmi-aio.c > index 755c6d2..3dccbaa 100644 > --- a/drivers/platform/x86/dell-wmi-aio.c > +++ b/drivers/platform/x86/dell-wmi-aio.c > @@ -32,7 +32,7 @@ MODULE_DESCRIPTION("WMI hotkeys driver for Dell All-In-One series"); > MODULE_LICENSE("GPL"); > > #define EVENT_GUID1 "284A0E6B-380E-472A-921F-E52786257FB4" > -#define EVENT_GUID2 "02314822-307C-4F66-bf0E-48AEAEB26CC8" > +#define EVENT_GUID2 "02314822-307C-4F66-BF0E-48AEAEB26CC8" > > static char *dell_wmi_aio_guids[] = { > EVENT_GUID1, > @@ -40,10 +40,6 @@ static char *dell_wmi_aio_guids[] = { > NULL > }; > > -/* Temporary workaround until the WMI sysfs interface goes in. > - Borrowed from acer-wmi */ > -MODULE_ALIAS("dmi:*:*Dell*:*:"); > - > MODULE_ALIAS("wmi:"EVENT_GUID1); > MODULE_ALIAS("wmi:"EVENT_GUID2); > Acked-by: Brad Figg <brad.figg@canonical.com>
diff --git a/drivers/platform/x86/dell-wmi-aio.c b/drivers/platform/x86/dell-wmi-aio.c index 755c6d2..3dccbaa 100644 --- a/drivers/platform/x86/dell-wmi-aio.c +++ b/drivers/platform/x86/dell-wmi-aio.c @@ -32,7 +32,7 @@ MODULE_DESCRIPTION("WMI hotkeys driver for Dell All-In-One series"); MODULE_LICENSE("GPL"); #define EVENT_GUID1 "284A0E6B-380E-472A-921F-E52786257FB4" -#define EVENT_GUID2 "02314822-307C-4F66-bf0E-48AEAEB26CC8" +#define EVENT_GUID2 "02314822-307C-4F66-BF0E-48AEAEB26CC8" static char *dell_wmi_aio_guids[] = { EVENT_GUID1, @@ -40,10 +40,6 @@ static char *dell_wmi_aio_guids[] = { NULL }; -/* Temporary workaround until the WMI sysfs interface goes in. - Borrowed from acer-wmi */ -MODULE_ALIAS("dmi:*:*Dell*:*:"); - MODULE_ALIAS("wmi:"EVENT_GUID1); MODULE_ALIAS("wmi:"EVENT_GUID2);