From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Mack Subject: Re: [PATCH v2 1/2] cap1106: Add support for various cap11xx devices Date: Tue, 23 Sep 2014 08:46:34 +0200 Message-ID: <5421174A.7060101@zonque.org> References: <1411445057-30048-1-git-send-email-mranostay@gmail.com> <1411445057-30048-2-git-send-email-mranostay@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from svenfoo.org ([82.94.215.22]:44406 "EHLO mail.zonque.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751833AbaIWGqh (ORCPT ); Tue, 23 Sep 2014 02:46:37 -0400 In-Reply-To: <1411445057-30048-2-git-send-email-mranostay@gmail.com> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Matt Ranostay , galak@codeaurora.org, dmitry.torokhov@gmail.com, zonque@gmail.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org Cc: devicetree@vger.kernel.org On 09/23/2014 06:04 AM, Matt Ranostay wrote: > diff --git a/drivers/input/keyboard/cap1106.c b/drivers/input/keyboard/cap1106.c > index d70b65a..07f9e88 100644 > --- a/drivers/input/keyboard/cap1106.c > +++ b/drivers/input/keyboard/cap1106.c > @@ -55,8 +55,6 @@ > #define CAP1106_REG_MANUFACTURER_ID 0xfe > #define CAP1106_REG_REVISION 0xff > > -#define CAP1106_NUM_CHN 6 > -#define CAP1106_PRODUCT_ID 0x55 > #define CAP1106_MANUFACTURER_ID 0x5d > > struct cap1106_priv { > @@ -64,7 +62,25 @@ struct cap1106_priv { > struct input_dev *idev; > > /* config */ > - unsigned short keycodes[CAP1106_NUM_CHN]; > + u32 *keycodes; > + unsigned int num_channels; > +}; > + > +struct cap11xx_hw_model { > + uint8_t product_id; > + unsigned int num_channels; > +}; > + > +enum { > + CAP1106, > + CAP1126, > + CAP1188, > +}; > + > +struct cap11xx_hw_model cap11xx_devices[] = { This can be static const. And, as I said, there should be a 3rd patch that renames the file and its functions, structs, defines etc to the more generic "11xx" variants. Thanks, Daniel