[RFC] [Maverick] UBUNTU: SAUCE: Add MODULE_ALIAS for Dell WMI module

[Mario Limonciello]

Hi Leann:

I've just tested on a machine that normally uses dell-wmi w/ the
maverick daily, and indeed dropping that sauce patch now works.  Go
ahead and drop it.

Thanks,

On 06/09/2010 01:15 PM, Leann Ogasawara wrote:
> Hi Mario,
>
> We've been temporarily carrying an Ubuntu SAUCE patch (inlined at the
> bottom), originally authored by yourself.  In the commit message you'd
> noted that upstream was not in favor of applying this patch but instead
> would prefer to wait for the WMI sysfs interface to be incorporated.  It
> seems that this has now been added as of 2.6.33-rc1:
>
> commit 1caab3c1a90be3aa4ec3599409d8fe044b077478
> Author: Matthew Garrett <mjg at redhat.com>
> Date:   Wed Nov 4 14:17:53 2009 -0500
>
>     wmi: Add support for module autoloading
>
> I assume it is now safe for us to drop the temporary patch we've been
> carrying that you had originally authored?  I see that acer-wmi already
> dropped similar bits it was carrying:
>
> commit 4d5f177caf1ef78f5e7eaee75b66b4d534445682
> Author: Thomas Renninger <trenn at suse.de>
> Date:   Fri Dec 18 15:29:22 2009 +0100
>
>     acer-wmi, msi-wmi: Remove needless DMI MODULE_ALIAS
>     
>     Now that we have WMI autoloading
>     the DMI matching is not needed anymore.
>
> Thanks,
> Leann
>
> >From a0d5c1898b6ad79e5eb1d26edaf17cbf7f48ace8 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner at canonical.com>
> Date: Wed, 13 May 2009 11:38:45 -0600
> Subject: [PATCH] UBUNTU: SAUCE: Add MODULE_ALIAS for Dell WMI module
>
> >From Mario Limonciello: Until the sysfs WMI interface is ready, there is no way
> to automatically determine when to load dell-wmi.  The equivalent module for Acer
> laptops, acer-wmi has a workaround in place to match on the DMI tables for the machine.
> This type of solution works on for Dell as well and gets the module loading when necessary.
>
> Upstream is not in favor of applying this patch, but rather waiting for the sysfs
> interface to be ready. Until it is, this provides a solution to ensure machines that
> support WMI hotkeys are functional.
>
> OriginalAuthor: mario_limonciello at dell.com
>
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
> ---
>  drivers/platform/x86/dell-wmi.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
> index 66f53c3..830be3c 100644
> --- a/drivers/platform/x86/dell-wmi.c
> +++ b/drivers/platform/x86/dell-wmi.c
> @@ -44,6 +44,10 @@ static int acpi_video;
>  
>  MODULE_ALIAS("wmi:"DELL_EVENT_GUID);
>  
> +/* Temporary workaround until the WMI sysfs interface goes in.
> +   Borrowed from acer-wmi */
> +MODULE_ALIAS("dmi:*:*Dell*:*:");
> +
>  struct key_entry {
>  	char type;		/* See KE_* below */
>  	u16 code;
>   

-- 
*Mario Limonciello*
Linux Engineer
*Dell* | OS Engineering
*office* +1 512 850 5627
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20100609/3d34e0ea/attachment.html>