On Wed, 14 Nov 2012 08:48:06 -0800 Dmitry Torokhov <[email protected]> wrote:
> This matches structure of most other input drivers. > > Signed-off-by: Dmitry Torokhov <[email protected]> Reviewed-by: Alban Bedel <[email protected]> > --- > drivers/input/keyboard/tca8418_keypad.c | 29 ++++++++++++++--------------- > 1 file changed, 14 insertions(+), 15 deletions(-) > > diff --git a/drivers/input/keyboard/tca8418_keypad.c > b/drivers/input/keyboard/tca8418_keypad.c > index 7f2869f..35340c3 100644 > --- a/drivers/input/keyboard/tca8418_keypad.c > +++ b/drivers/input/keyboard/tca8418_keypad.c > @@ -110,21 +110,6 @@ > #define KEY_EVENT_CODE 0x7f > #define KEY_EVENT_VALUE 0x80 > > - > -static const struct i2c_device_id tca8418_id[] = { > - { TCA8418_NAME, 8418, }, > - { } > -}; > -MODULE_DEVICE_TABLE(i2c, tca8418_id); > - > -#ifdef CONFIG_OF > -static const struct of_device_id tca8418_dt_ids[] __devinitconst = { > - { .compatible = "ti,tca8418", }, > - { } > -}; > -MODULE_DEVICE_TABLE(of, tca8418_dt_ids); > -#endif > - > struct tca8418_keypad { > unsigned int irq; > unsigned int row_shift; > @@ -419,6 +404,20 @@ static int __devexit tca8418_keypad_remove(struct > i2c_client *client) > return 0; > } > > +static const struct i2c_device_id tca8418_id[] = { > + { TCA8418_NAME, 8418, }, > + { } > +}; > +MODULE_DEVICE_TABLE(i2c, tca8418_id); > + > +#ifdef CONFIG_OF > +static const struct of_device_id tca8418_dt_ids[] __devinitconst = { > + { .compatible = "ti,tca8418", }, > + { } > +}; > +MODULE_DEVICE_TABLE(of, tca8418_dt_ids); > +#endif > + > static struct i2c_driver tca8418_keypad_driver = { > .driver = { > .name = TCA8418_NAME, -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
