Skip to contentSkip to conversation

Input: remove a duplicative NULL test

PATCH In review Dan Carpenter 5 participants 5 messages Feb 21, 2014 – Mar 19, 2014

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Input: remove a duplicative NULL test

"pdata" is non-NULL here. We verified that at the start of the function.

drivers/input/touchscreen/atmel_mxt_ts.c +1 -1
index a70400754e92..40abe90cc924 100644
@@ -1146,7 +1146,7 @@ static int mxt_probe(struct i2c_client *client,
 		goto err_free_mem;
 	}
 
-	data->is_tp = pdata && pdata->is_tp;
+	data->is_tp = pdata->is_tp;
 
 	input_dev->name = (data->is_tp) ? "Atmel maXTouch Touchpad" :
 					  "Atmel maXTouch Touchscreen";
Acked-by Fugang Duan on v1 1/1
#1 lore raw

From: Dan Carpenter <[email protected]>
Data: Friday, February 21, 2014 4:55 PM

Quoted 16 lines

To: Dmitry Torokhov
Cc: Paul Gortmaker; Jingoo Han; Duan Fugang-B38611; Benson Leung; Daniel Kurtz; [email protected]; [email protected]
Subject: [patch] Input: remove a duplicative NULL test

"pdata" is non-NULL here. We verified that at the start of the function.

drivers/input/touchscreen/atmel_mxt_ts.c +0 -0
index a70400754e92..40abe90cc924 100644

drivers/input/touchscreen/atmel_mxt_ts.c static int mxt_probe(struct i2c_client *client, · line 1152

Quoted 8 lines
drivers/input/touchscreen/atmel_mxt_ts.c +1 -1
@@ -1146,7 +1146,7 @@ static int mxt_probe(struct i2c_client *client,
 		goto err_free_mem;
 	}
 
-	data->is_tp = pdata && pdata->is_tp;
+	data->is_tp = pdata->is_tp;
 
 	input_dev->name = (data->is_tp) ? "Atmel maXTouch Touchpad" :
 					  "Atmel maXTouch Touchscreen";

Agree, it is redundant. And if you have free time, you can convert the driver to support devicetree.

#2 lore raw
Quoted 2 lines · On Fri, Feb 21, 2014 at 1:14 AM, [email protected]…

Agree, it is redundant. And if you have free time, you can convert the driver to support devicetree.

Please check with Nick Dyer before you convert this driver to support devicetree. Much of the platform data this driver uses has been eliminated or consolidated in a patch series that he's been working on.

Signature · 3 lines
Benson Leung
Software Engineer, Chrom* OS
[email protected]
#3 lore raw
Quoted 10 lines
Quoted 3 lines · On Fri, Feb 21, 2014 at 1:14 AM, [email protected]…

Agree, it is redundant. And if you have free time, you can convert the driver to support devicetree.

Please check with Nick Dyer before you convert this driver to support devicetree. Much of the platform data this driver uses has been eliminated or consolidated in a patch series that he's been working on.

If you look at the "improve T19 GPIO keys handling" patch in the patch set I posted to linux-input on 17th March, this redundant NULL test has been removed.

I want to remove most of the existing platform data since it is not generic across all chips - see "remove unnecessary platform data" and "read screen config from chip" in that series of patches. It's high priority on my list to implement device tree support for the remaining items, which will be just irqflags and the touchpad key config.

#4 lore raw
In reply to Dan Carpenter

T24gRnJpZGF5LCBGZWJydWFyeSAyMSwgMjAxNCA2OjE1IFBNLCBmdWdhbmcuZHVhbkBmcmVlc2Nh bGUuY29tIHdyb3RlOg0KPiANCj4gRnJvbTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBv cmFjbGUuY29tPg0KPiBEYXRhOiBGcmlkYXksIEZlYnJ1YXJ5IDIxLCAyMDE0IDQ6NTUgUE0NCj4g DQo+ID5UbzogRG1pdHJ5IFRvcm9raG92DQo+ID5DYzogUGF1bCBHb3J0bWFrZXI7IEppbmdvbyBI YW47IER1YW4gRnVnYW5nLUIzODYxMTsgQmVuc29uIExldW5nOyBEYW5pZWwgS3VydHo7DQo+ID5s aW51eC1pbnB1dEB2Z2VyLmtlcm5lbC5vcmc7IGtlcm5lbC1qYW5pdG9yc0B2Z2VyLmtlcm5lbC5v cmcNCj4gPlN1YmplY3Q6IFtwYXRjaF0gSW5wdXQ6IHJlbW92ZSBhIGR1cGxpY2F0aXZlIE5VTEwg dGVzdA0KPiA+DQo+ID4icGRhdGEiIGlzIG5vbi1OVUxMIGhlcmUuICBXZSB2ZXJpZmllZCB0aGF0 IGF0IHRoZSBzdGFydCBvZiB0aGUgZnVuY3Rpb24uDQo+ID4NCj4gPlNpZ25lZC1vZmYtYnk6IERh biBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4NCj4gPg0KPiA+ZGlmZiAtLWdp dCBhL2RyaXZlcnMvaW5wdXQvdG91Y2hzY3JlZW4vYXRtZWxfbXh0X3RzLmMNCj4gPmIvZHJpdmVy cy9pbnB1dC90b3VjaHNjcmVlbi9hdG1lbF9teHRfdHMuYw0KPiA+aW5kZXggYTcwNDAwNzU0ZTky Li40MGFiZTkwY2M5MjQgMTAwNjQ0DQo+ID4tLS0gYS9kcml2ZXJzL2lucHV0L3RvdWNoc2NyZWVu L2F0bWVsX214dF90cy5jDQo+ID4rKysgYi9kcml2ZXJzL2lucHV0L3RvdWNoc2NyZWVuL2F0bWVs X214dF90cy5jDQo+ID5AQCAtMTE0Niw3ICsxMTQ2LDcgQEAgc3RhdGljIGludCBteHRfcHJvYmUo c3RydWN0IGkyY19jbGllbnQgKmNsaWVudCwNCj4gPiAJCWdvdG8gZXJyX2ZyZWVfbWVtOw0KPiA+ IAl9DQo+ID4NCj4gPi0JZGF0YS0+aXNfdHAgPSBwZGF0YSAmJiBwZGF0YS0+aXNfdHA7DQo+ID4r CWRhdGEtPmlzX3RwID0gcGRhdGEtPmlzX3RwOw0KPiA+DQo+ID4gCWlucHV0X2Rldi0+bmFtZSA9 IChkYXRhLT5pc190cCkgPyAiQXRtZWwgbWFYVG91Y2ggVG91Y2hwYWQiIDoNCj4gPiAJCQkJCSAg IkF0bWVsIG1hWFRvdWNoIFRvdWNoc2NyZWVuIjsNCj4gPg0KPiBBZ3JlZSwgaXQgaXMgcmVkdW5k YW50LiBBbmQgaWYgeW91IGhhdmUgZnJlZSB0aW1lLCB5b3UgY2FuIGNvbnZlcnQgdGhlIGRyaXZl ciB0byBzdXBwb3J0IGRldmljZXRyZWUuDQo+IA0KPiBBY2tlZC1ieTogRnVnYW5nIER1YW4gPEIz ODYxMUBmcmVlc2NhbGUuY29tPg0KDQpSZXZpZXdlZC1ieTogSmluZ29vIEhhbiA8amcxLmhhbkBz YW1zdW5nLmNvbT4NCg0KQmVzdCByZWdhcmRzLA0KSmluZ29vIEhhbg0K