Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760338AbaGYM63 (ORCPT ); Fri, 25 Jul 2014 08:58:29 -0400 Received: from smtp206.alice.it ([82.57.200.102]:10057 "EHLO smtp206.alice.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752233AbaGYM62 (ORCPT ); Fri, 25 Jul 2014 08:58:28 -0400 Date: Fri, 25 Jul 2014 14:58:11 +0200 From: Antonio Ospite To: Jamie Lentin Cc: Jiri Kosina , Hans de Goede , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 2/4] HID: lenovo: Prepare support for adding other devices Message-Id: <20140725145811.8fdbbced3de25c9f9e4ede00@ao2.it> In-Reply-To: <1406154648-14000-3-git-send-email-jm@lentin.co.uk> References: <1406154648-14000-1-git-send-email-jm@lentin.co.uk> <1406154648-14000-3-git-send-email-jm@lentin.co.uk> X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.24; x86_64-pc-linux-gnu) X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 23 Jul 2014 23:30:46 +0100 Jamie Lentin wrote: > Ensure all tpkbd specifics are within a postfixed function, the > main functions for the driver should just switch to the appropriate > function depending on product ID. Given this, we can add extra devices > by including extra postfixed functions. > > Signed-off-by: Jamie Lentin > Reviewed-by: Antonio Ospite > --- > drivers/hid/hid-lenovo.c | 53 ++++++++++++++++++++++++++++++++++++++++-------- > 1 file changed, 45 insertions(+), 8 deletions(-) > > diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c > index 0320b96..a56b9e7 100644 > --- a/drivers/hid/hid-lenovo.c > +++ b/drivers/hid/hid-lenovo.c > @@ -1,5 +1,6 @@ > /* > - * HID driver for Lenovo ThinkPad USB Keyboard with TrackPoint > + * HID driver for Lenovo: > + * - ThinkPad USB Keyboard with TrackPoint (tpkbd) > * > * Copyright (c) 2012 Bernhard Seibold > */ > @@ -39,7 +40,7 @@ static int lenovo_input_mapping_tpkbd(struct hid_device *hdev, > struct hid_usage *usage, unsigned long **bit, int *max) > { > if (usage->hid == (HID_UP_BUTTON | 0x0010)) { > - /* mark the device as pointer */ > + /* This sub-device contains trackpoint, mark it */ > hid_set_drvdata(hdev, (void *)1); > map_key_clear(KEY_MICMUTE); > return 1; > @@ -47,6 +48,19 @@ static int lenovo_input_mapping_tpkbd(struct hid_device *hdev, > return 0; > } > > +static int lenovo_input_mapping(struct hid_device *hdev, > + struct hid_input *hi, struct hid_field *field, > + struct hid_usage *usage, unsigned long **bit, int *max) > +{ > + switch (hdev->product) { > + case USB_DEVICE_ID_LENOVO_TPKBD: > + return lenovo_input_mapping_tpkbd(hdev, hi, field, > + usage, bit, max); > + default: > + return 0; > + } > +} > + > #undef map_key_clear > > static int lenovo_features_set_tpkbd(struct hid_device *hdev) > @@ -337,6 +351,15 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev) > char *name_mute, *name_micmute; > int i; > > + /* > + * Only register extra settings against subdevice where input_mapping > + * set drvdata to 1, i.e. the trackpoint. > + */ > + if (!hid_get_drvdata(hdev)) > + return 0; > + > + hid_set_drvdata(hdev, NULL); > + > /* Validate required reports. */ > for (i = 0; i < 4; i++) { > if (!hid_validate_values(hdev, HID_FEATURE_REPORT, 4, i, 1)) > @@ -409,12 +432,16 @@ static int lenovo_probe(struct hid_device *hdev, > goto err; > } > > - if (hid_get_drvdata(hdev)) { > - hid_set_drvdata(hdev, NULL); > + switch (hdev->product) { > + case USB_DEVICE_ID_LENOVO_TPKBD: > ret = lenovo_probe_tpkbd(hdev); > - if (ret) > - goto err_hid; > + break; > + default: > + ret = 0; > + break; > } > + if (ret) > + goto err_hid; > > return 0; > err_hid: > @@ -427,6 +454,13 @@ static void lenovo_remove_tpkbd(struct hid_device *hdev) > { > struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev); > > + /* > + * Only the trackpoint half of the keyboard has drvdata and stuff that > + * needs unregistering. > + */ > + if (data_pointer == NULL) > + return; > + > sysfs_remove_group(&hdev->dev.kobj, > &lenovo_attr_group_tpkbd); > > @@ -438,8 +472,11 @@ static void lenovo_remove_tpkbd(struct hid_device *hdev) > > static void lenovo_remove(struct hid_device *hdev) > { > - if (hid_get_drvdata(hdev)) > + switch (hdev->product) { > + case USB_DEVICE_ID_LENOVO_TPKBD: > lenovo_remove_tpkbd(hdev); > + break; > + } > > hid_hw_stop(hdev); > } > @@ -454,7 +491,7 @@ MODULE_DEVICE_TABLE(hid, lenovo_devices); > static struct hid_driver lenovo_driver = { > .name = "lenovo", > .id_table = lenovo_devices, > - .input_mapping = lenovo_input_mapping_tpkbd, > + .input_mapping = lenovo_input_mapping, > .probe = lenovo_probe, > .remove = lenovo_remove, > }; > -- > 2.0.0 > > -- Antonio Ospite http://ao2.it A: Because it messes up the order in which people normally read text. See http://en.wikipedia.org/wiki/Posting_style Q: Why is top-posting such a bad thing? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/