From patchwork Wed Sep 4 09:27:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 2853556 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EBE429F485 for ; Wed, 4 Sep 2013 09:26:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5012220216 for ; Wed, 4 Sep 2013 09:26:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A55F72020F for ; Wed, 4 Sep 2013 09:26:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762222Ab3IDJ0j (ORCPT ); Wed, 4 Sep 2013 05:26:39 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:45335 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762210Ab3IDJ0i (ORCPT ); Wed, 4 Sep 2013 05:26:38 -0400 Received: by mail-wi0-f169.google.com with SMTP id hj3so2940327wib.2 for ; Wed, 04 Sep 2013 02:26:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xbE5qmOWPi3S5BHFSYCONGpPtu8Lb4vH7W+oyUE62Ps=; b=S5SLTgNSsqrnDiEHnqxwtf4bIKyy0ObKHKOhm1vurVIw0wVqU/spZYoOlGejjBtFVS 5B0jFBC8S3Io9tG7Kw/Ox3vM7D9fZ+seNCAjf7lu+saBPcYE1tJ5uSECiioZIYh+OySx 5ui0pr6e6i2j09o2ZqCNMZKYBpf6KmRKF/9QSnU6qMABeioVOiyuS9jwvqKHfgDNPv4+ rTlJd9Qag0re5c6Ezqtc3taZ+GwlXlkBsiCsRXZNCrBfGzXR2WxdUseEJLPen+nzOkwq wNIji6HtRvcne7uqvNCkzCSlx2i0vfRhwIeVa7pD+xxi9SlsDrsi5c4djgRpvJDEWvEP dH/Q== X-Gm-Message-State: ALoCoQk0gGcIElawnj27f+Gn2KyXpKr9ImtfTUbJbcTRD3d+JqFKARDDf/LJd5prJ8sFsGoPlbp2 X-Received: by 10.180.90.69 with SMTP id bu5mr1357814wib.1.1378286797141; Wed, 04 Sep 2013 02:26:37 -0700 (PDT) Received: from localhost.localdomain (ip-189.net-89-2-206.rev.numericable.fr. [89.2.206.189]) by mx.google.com with ESMTPSA id b13sm2509552wic.9.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Sep 2013 02:26:36 -0700 (PDT) From: Tom Gundersen To: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Tom Gundersen , Matthew Garrett , Dmitry Torokhov Subject: [PATCH] input: i8042 - add PNP modaliases Date: Wed, 4 Sep 2013 11:27:36 +0200 Message-Id: <1378286856-6384-1-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.8.4 In-Reply-To: <20130903193547.GA8150@srcf.ucam.org> References: <20130903193547.GA8150@srcf.ucam.org> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This allows the module to be autoloaded in the common case. In order to work on non-PnP systems the module should be compiled in or loaded unconditionally at boot (c.f. modules-load.d(5)), as before. Cc: Matthew Garrett Cc: Dmitry Torokhov Signed-off-by: Tom Gundersen --- This appears to work for me (though I don't have the real hardware to test), I get the following aliases: alias: acpi*:CPQA0D7:* alias: pnp:dCPQA0D7* alias: acpi*:PNP0345:* alias: pnp:dPNP0345* alias: acpi*:PNP0344:* alias: pnp:dPNP0344* alias: acpi*:PNP0343:* alias: pnp:dPNP0343* alias: acpi*:PNP0320:* alias: pnp:dPNP0320* alias: acpi*:PNP030B:* alias: pnp:dPNP030b* alias: acpi*:PNP030A:* alias: pnp:dPNP030a* alias: acpi*:PNP0309:* alias: pnp:dPNP0309* alias: acpi*:PNP0306:* alias: pnp:dPNP0306* alias: acpi*:PNP0305:* alias: pnp:dPNP0305* alias: acpi*:PNP0304:* alias: pnp:dPNP0304* alias: acpi*:PNP0303:* alias: pnp:dPNP0303* alias: acpi*:PNP0302:* alias: pnp:dPNP0302* alias: acpi*:PNP0301:* alias: pnp:dPNP0301* alias: acpi*:PNP0300:* alias: pnp:dPNP0300* drivers/input/serio/i8042-x86ia64io.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 5f306f7..0ec9abb 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -765,6 +765,7 @@ static struct pnp_device_id pnp_kbd_devids[] = { { .id = "CPQA0D7", .driver_data = 0 }, { .id = "", }, }; +MODULE_DEVICE_TABLE(pnp, pnp_kbd_devids); static struct pnp_driver i8042_pnp_kbd_driver = { .name = "i8042 kbd", @@ -786,6 +787,7 @@ static struct pnp_device_id pnp_aux_devids[] = { { .id = "SYN0801", .driver_data = 0 }, { .id = "", }, }; +MODULE_DEVICE_TABLE(pnp, pnp_aux_devids); static struct pnp_driver i8042_pnp_aux_driver = { .name = "i8042 aux",