| Message ID | 1395234563-11034-2-git-send-email-LW@KARO-electronics.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
From: Lothar Waßmann <LW@KARO-electronics.de> Data: Wednesday, March 19, 2014 9:09 PM >To: Dmitry Torokhov; Duan Fugang-B38611; Grant Likely; Henrik Rydberg; Ian >Campbell; Jingoo Han; Kumar Gala; Mark Rutland; Pawel Moll; Rob Herring; Rob >Landley; Sachin Kamat; devicetree@vger.kernel.org; linux-doc@vger.kernel.org; >linux-input@vger.kernel.org; linux-kernel@vger.kernel.org; Simon Budig; Lothar >Waßmann >Subject: [PATCHv4 1/5] Input: edt-ft5x06: several cleanups; no functional >change > >- remove redundant parens >- remove redundant type casts >- fix mixed tab/space indentation > >Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> >--- > drivers/input/touchscreen/edt-ft5x06.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > >diff --git a/drivers/input/touchscreen/edt-ft5x06.c >b/drivers/input/touchscreen/edt-ft5x06.c >index 412a85e..7b4470d 100644 >--- a/drivers/input/touchscreen/edt-ft5x06.c >+++ b/drivers/input/touchscreen/edt-ft5x06.c >@@ -173,7 +173,7 @@ static irqreturn_t edt_ft5x06_ts_isr(int irq, void *dev_id) > x = ((buf[0] << 8) | buf[1]) & 0x0fff; > y = ((buf[2] << 8) | buf[3]) & 0x0fff; > id = (buf[2] >> 4) & 0x0f; >- down = (type != TOUCH_EVENT_UP); >+ down = type != TOUCH_EVENT_UP; > > input_mt_slot(tsdata->input, id); > input_mt_report_slot_state(tsdata->input, MT_TOOL_FINGER, down); >@@ -257,7 +257,7 @@ static ssize_t edt_ft5x06_setting_show(struct device *dev, > struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client); > struct edt_ft5x06_attribute *attr = > container_of(dattr, struct edt_ft5x06_attribute, dattr); >- u8 *field = (u8 *)((char *)tsdata + attr->field_offset); >+ u8 *field = (u8 *)tsdata + attr->field_offset; > int val; > size_t count = 0; > int error = 0; >@@ -299,7 +299,7 @@ static ssize_t edt_ft5x06_setting_store(struct device *dev, > struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client); > struct edt_ft5x06_attribute *attr = > container_of(dattr, struct edt_ft5x06_attribute, dattr); >- u8 *field = (u8 *)((char *)tsdata + attr->field_offset); >+ u8 *field = (u8 *)tsdata + attr->field_offset; > unsigned int val; > int error; > >@@ -479,7 +479,7 @@ static int edt_ft5x06_debugfs_mode_set(void *data, u64 mode) > > if (mode != tsdata->factory_mode) { > retval = mode ? edt_ft5x06_factory_mode(tsdata) : >- edt_ft5x06_work_mode(tsdata); >+ edt_ft5x06_work_mode(tsdata); > } > > mutex_unlock(&tsdata->mutex); >@@ -852,8 +852,8 @@ static SIMPLE_DEV_PM_OPS(edt_ft5x06_ts_pm_ops, > edt_ft5x06_ts_suspend, edt_ft5x06_ts_resume); > > static const struct i2c_device_id edt_ft5x06_ts_id[] = { >- { "edt-ft5x06", 0 }, >- { } >+ { "edt-ft5x06", 0, }, >+ { /* sentinel */ } > }; > MODULE_DEVICE_TABLE(i2c, edt_ft5x06_ts_id); > >-- >1.7.10.4 > > Acked-by: Fugang Duan <B38611@freescale.com>
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c index 412a85e..7b4470d 100644 --- a/drivers/input/touchscreen/edt-ft5x06.c +++ b/drivers/input/touchscreen/edt-ft5x06.c @@ -173,7 +173,7 @@ static irqreturn_t edt_ft5x06_ts_isr(int irq, void *dev_id) x = ((buf[0] << 8) | buf[1]) & 0x0fff; y = ((buf[2] << 8) | buf[3]) & 0x0fff; id = (buf[2] >> 4) & 0x0f; - down = (type != TOUCH_EVENT_UP); + down = type != TOUCH_EVENT_UP; input_mt_slot(tsdata->input, id); input_mt_report_slot_state(tsdata->input, MT_TOOL_FINGER, down); @@ -257,7 +257,7 @@ static ssize_t edt_ft5x06_setting_show(struct device *dev, struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client); struct edt_ft5x06_attribute *attr = container_of(dattr, struct edt_ft5x06_attribute, dattr); - u8 *field = (u8 *)((char *)tsdata + attr->field_offset); + u8 *field = (u8 *)tsdata + attr->field_offset; int val; size_t count = 0; int error = 0; @@ -299,7 +299,7 @@ static ssize_t edt_ft5x06_setting_store(struct device *dev, struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client); struct edt_ft5x06_attribute *attr = container_of(dattr, struct edt_ft5x06_attribute, dattr); - u8 *field = (u8 *)((char *)tsdata + attr->field_offset); + u8 *field = (u8 *)tsdata + attr->field_offset; unsigned int val; int error; @@ -479,7 +479,7 @@ static int edt_ft5x06_debugfs_mode_set(void *data, u64 mode) if (mode != tsdata->factory_mode) { retval = mode ? edt_ft5x06_factory_mode(tsdata) : - edt_ft5x06_work_mode(tsdata); + edt_ft5x06_work_mode(tsdata); } mutex_unlock(&tsdata->mutex); @@ -852,8 +852,8 @@ static SIMPLE_DEV_PM_OPS(edt_ft5x06_ts_pm_ops, edt_ft5x06_ts_suspend, edt_ft5x06_ts_resume); static const struct i2c_device_id edt_ft5x06_ts_id[] = { - { "edt-ft5x06", 0 }, - { } + { "edt-ft5x06", 0, }, + { /* sentinel */ } }; MODULE_DEVICE_TABLE(i2c, edt_ft5x06_ts_id);
- remove redundant parens - remove redundant type casts - fix mixed tab/space indentation Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> --- drivers/input/touchscreen/edt-ft5x06.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)