From patchwork Tue Oct 12 19:17:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 248891 X-Patchwork-Delegate: deller@gmx.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9CJKtxq009176 for ; Tue, 12 Oct 2010 19:22:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758142Ab0JLTW4 (ORCPT ); Tue, 12 Oct 2010 15:22:56 -0400 Received: from juliette.telenet-ops.be ([195.130.137.74]:57199 "EHLO juliette.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754247Ab0JLTW4 (ORCPT ); Tue, 12 Oct 2010 15:22:56 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 12 Oct 2010 19:22:57 +0000 (UTC) X-Greylist: delayed 300 seconds by postgrey-1.27 at vger.kernel.org; Tue, 12 Oct 2010 15:22:55 EDT Received: from ayla.of.borg ([94.224.189.190]) by juliette.telenet-ops.be with bizsmtp id HvHq1f00A46vLmN06vHqRx; Tue, 12 Oct 2010 21:17:54 +0200 Received: from geert (helo=localhost) by ayla.of.borg with local-esmtp (Exim 4.71) (envelope-from ) id 1P5kM9-0001he-V1; Tue, 12 Oct 2010 21:17:50 +0200 Date: Tue, 12 Oct 2010 21:17:49 +0200 (CEST) From: Geert Uytterhoeven To: Dzianis Kahanovich , Dmitry Torokhov , Helge Deller cc: linux-next@vger.kernel.org, linux-input@vger.kernel.org, Linux/m68k , linux-parisc@vger.kernel.org Subject: [PATCH/RFC] input: hil_mlc - Fix hil_mlc_serio_id file2alias failure Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c index cc8e01f..43904db 100644 --- a/drivers/input/serio/hil_mlc.c +++ b/drivers/input/serio/hil_mlc.c @@ -897,11 +897,15 @@ static void hil_mlc_serio_close(struct serio *serio) /* TODO wake up interruptable */ } -static const struct serio_device_id hil_mlc_serio_id = { - .type = SERIO_HIL_MLC, - .proto = SERIO_HIL, - .extra = SERIO_ANY, - .id = SERIO_ANY, +static const struct serio_device_id hil_mlc_serio_ids[] = { + { + /* There's only one ID, which is a catch-all */ + .type = SERIO_HIL_MLC, + .proto = SERIO_HIL, + .extra = SERIO_ANY, + .id = SERIO_ANY, + }, + { 0 } }; int hil_mlc_register(hil_mlc *mlc) @@ -934,7 +938,7 @@ int hil_mlc_register(hil_mlc *mlc) mlc->serio[i] = mlc_serio; snprintf(mlc_serio->name, sizeof(mlc_serio->name)-1, "HIL_SERIO%d", i); snprintf(mlc_serio->phys, sizeof(mlc_serio->phys)-1, "HIL%d", i); - mlc_serio->id = hil_mlc_serio_id; + mlc_serio->id = hil_mlc_serio_ids[0]; mlc_serio->id.id = i; /* HIL port no. */ mlc_serio->write = hil_mlc_serio_write; mlc_serio->open = hil_mlc_serio_open; @@ -1011,7 +1015,7 @@ static void __exit hil_mlc_exit(void) } -MODULE_DEVICE_TABLE(serio, hil_mlc_serio_id); +MODULE_DEVICE_TABLE(serio, hil_mlc_serio_ids); module_init(hil_mlc_init); module_exit(hil_mlc_exit);