These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / input / touchscreen / cyttsp4_i2c.c

diff --git a/kernel/drivers/input/touchscreen/cyttsp4_i2c.c b/kernel/drivers/input/touchscreen/cyttsp4_i2c.c
index 8e2012c..564e490 100644 (file)
--- a/kernel/drivers/input/touchscreen/cyttsp4_i2c.c
+++ b/kernel/drivers/input/touchscreen/cyttsp4_i2c.c
@@ -50,10 +50,7 @@ static int cyttsp4_i2c_probe(struct i2c_client *client,
        ts = cyttsp4_probe(&cyttsp4_i2c_bus_ops, &client->dev, client->irq,
                          CYTTSP4_I2C_DATA_SIZE);
 
-       if (IS_ERR(ts))
-               return PTR_ERR(ts);
-
-       return 0;
+       return PTR_ERR_OR_ZERO(ts);
 }
 
 static int cyttsp4_i2c_remove(struct i2c_client *client)
@@ -74,7 +71,6 @@ MODULE_DEVICE_TABLE(i2c, cyttsp4_i2c_id);
 static struct i2c_driver cyttsp4_i2c_driver = {
        .driver = {
                .name   = CYTTSP4_I2C_NAME,
-               .owner  = THIS_MODULE,
                .pm     = &cyttsp4_pm_ops,
        },
        .probe          = cyttsp4_i2c_probe,
@@ -87,4 +83,3 @@ module_i2c_driver(cyttsp4_i2c_driver);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Cypress TrueTouch(R) Standard Product (TTSP) I2C driver");
 MODULE_AUTHOR("Cypress");
-MODULE_ALIAS("i2c:cyttsp4");