Skip to content

L
linux
Commit a866781e authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files
Options

Input: bu21013_ts - rename some variables 

"bu21013_data" and "struct bu21013_ts_data" are a tad long, let's call them
"ts" and "struct bu21013_ts".

Also rename retval to error in bu21013_init_chip() and adjust formatting;
i2c_smbus_write_byte_data() returns negative on error and 0 on success, so
we simply test if whether erro is 0 or not.
Tested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent a1b70a44
Show whitespace changes
Inline Side-by-side
Showing with 190 additions and 186 deletions
drivers/input/touchscreen/bu21013_ts.c
View file @ a866781e
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
#define DRIVER_TP "bu21013_tp" #define DRIVER_TP "bu21013_tp"
/** /**
* struct bu21013_ts_data - touch panel data structure * struct bu21013_ts - touch panel data structure
* @client: pointer to the i2c client * @client: pointer to the i2c client
* @wait: variable to wait_queue_head_t structure * @wait: variable to wait_queue_head_t structure
* @touch_stopped: touch stop flag * @touch_stopped: touch stop flag
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
* *
* Touch panel device data structure * Touch panel device data structure
*/ */
struct bu21013_ts_data { struct bu21013_ts {
struct i2c_client *client; struct i2c_client *client;
wait_queue_head_t wait; wait_queue_head_t wait;
const struct bu21013_platform_device *chip; const struct bu21013_platform_device *chip;
...@@ -161,34 +161,35 @@ struct bu21013_ts_data { ...@@ -161,34 +161,35 @@ struct bu21013_ts_data {
/** /**
* bu21013_read_block_data(): read the touch co-ordinates * bu21013_read_block_data(): read the touch co-ordinates
* @data: bu21013_ts_data structure pointer * @data: bu21013_ts structure pointer
* @buf: byte pointer * @buf: byte pointer
* *
* Read the touch co-ordinates using i2c read block into buffer * Read the touch co-ordinates using i2c read block into buffer
* and returns integer. * and returns integer.
*/ */
static int bu21013_read_block_data(struct bu21013_ts_data *data, u8 *buf) static int bu21013_read_block_data(struct bu21013_ts *ts, u8 *buf)
{ {
int ret, i; int ret, i;
for (i = 0; i < I2C_RETRY_COUNT; i++) { for (i = 0; i < I2C_RETRY_COUNT; i++) {
ret = i2c_smbus_read_i2c_block_data ret = i2c_smbus_read_i2c_block_data(ts->client,
(data->client, BU21013_SENSORS_BTN_0_7_REG, BU21013_SENSORS_BTN_0_7_REG,
LENGTH_OF_BUFFER, buf); LENGTH_OF_BUFFER, buf);
if (ret == LENGTH_OF_BUFFER) if (ret == LENGTH_OF_BUFFER)
return 0; return 0;
} }
return -EINVAL; return -EINVAL;
} }
/** /**
* bu21013_do_touch_report(): Get the touch co-ordinates * bu21013_do_touch_report(): Get the touch co-ordinates
* @data: bu21013_ts_data structure pointer * @data: bu21013_ts structure pointer
* *
* Get the touch co-ordinates from touch sensor registers and writes * Get the touch co-ordinates from touch sensor registers and writes
* into device structure and returns integer. * into device structure and returns integer.
*/ */
static int bu21013_do_touch_report(struct bu21013_ts_data *data) static int bu21013_do_touch_report(struct bu21013_ts *ts)
{ {
u8 buf[LENGTH_OF_BUFFER]; u8 buf[LENGTH_OF_BUFFER];
unsigned int pos_x[2], pos_y[2]; unsigned int pos_x[2], pos_y[2];
...@@ -196,10 +197,7 @@ static int bu21013_do_touch_report(struct bu21013_ts_data *data) ...@@ -196,10 +197,7 @@ static int bu21013_do_touch_report(struct bu21013_ts_data *data)
int finger_down_count = 0; int finger_down_count = 0;
int i; int i;
if (data == NULL) if (bu21013_read_block_data(ts, buf) < 0)
return -EINVAL;
if (bu21013_read_block_data(data, buf) < 0)
return -EINVAL; return -EINVAL;
has_x_sensors = hweight32(buf[0] & BU21013_SENSORS_EN_0_7); has_x_sensors = hweight32(buf[0] & BU21013_SENSORS_EN_0_7);
...@@ -227,21 +225,21 @@ static int bu21013_do_touch_report(struct bu21013_ts_data *data) ...@@ -227,21 +225,21 @@ static int bu21013_do_touch_report(struct bu21013_ts_data *data)
} }
for (i = 0; i < finger_down_count; i++) { for (i = 0; i < finger_down_count; i++) {
if (data->chip->x_flip) if (ts->chip->x_flip)
pos_x[i] = data->chip->touch_x_max - pos_x[i]; pos_x[i] = ts->chip->touch_x_max - pos_x[i];
if (data->chip->y_flip) if (ts->chip->y_flip)
pos_y[i] = data->chip->touch_y_max - pos_y[i]; pos_y[i] = ts->chip->touch_y_max - pos_y[i];
input_report_abs(data->in_dev, input_report_abs(ts->in_dev,
ABS_MT_POSITION_X, pos_x[i]); ABS_MT_POSITION_X, pos_x[i]);
input_report_abs(data->in_dev, input_report_abs(ts->in_dev,
ABS_MT_POSITION_Y, pos_y[i]); ABS_MT_POSITION_Y, pos_y[i]);
input_mt_sync(data->in_dev); input_mt_sync(ts->in_dev);
} }
} else } else
input_mt_sync(data->in_dev); input_mt_sync(ts->in_dev);
input_sync(data->in_dev); input_sync(ts->in_dev);
return 0; return 0;
} }
...@@ -255,23 +253,22 @@ static int bu21013_do_touch_report(struct bu21013_ts_data *data) ...@@ -255,23 +253,22 @@ static int bu21013_do_touch_report(struct bu21013_ts_data *data)
*/ */
static irqreturn_t bu21013_gpio_irq(int irq, void *device_data) static irqreturn_t bu21013_gpio_irq(int irq, void *device_data)
{ {
struct bu21013_ts_data *data = device_data; struct bu21013_ts *ts = device_data;
struct i2c_client *i2c = data->client;
int keep_polling; int keep_polling;
int retval; int error;
do { do {
retval = bu21013_do_touch_report(data); error = bu21013_do_touch_report(ts);
if (retval < 0) { if (error) {
dev_err(&i2c->dev, "bu21013_do_touch_report failed\n"); dev_err(&ts->client->dev, "%s failed\n", __func__);
break; break;
} }
keep_polling = gpiod_get_value(data->int_gpiod); keep_polling = gpiod_get_value(ts->int_gpiod);
if (keep_polling) if (keep_polling)
wait_event_timeout(data->wait, data->touch_stopped, wait_event_timeout(ts->wait, ts->touch_stopped,
msecs_to_jiffies(2)); msecs_to_jiffies(2));
} while (keep_polling && !data->touch_stopped); } while (keep_polling && !ts->touch_stopped);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -283,130 +280,138 @@ static irqreturn_t bu21013_gpio_irq(int irq, void *device_data) ...@@ -283,130 +280,138 @@ static irqreturn_t bu21013_gpio_irq(int irq, void *device_data)
* This function is used to power on * This function is used to power on
* the bu21013 controller and returns integer. * the bu21013 controller and returns integer.
*/ */
static int bu21013_init_chip(struct bu21013_ts_data *data) static int bu21013_init_chip(struct bu21013_ts *ts)
{ {
int retval; struct i2c_client *client = ts->client;
struct i2c_client *i2c = data->client; int error;
retval = i2c_smbus_write_byte_data(i2c, BU21013_RESET_REG, error = i2c_smbus_write_byte_data(client, BU21013_RESET_REG,
BU21013_RESET_ENABLE); BU21013_RESET_ENABLE);
if (retval < 0) { if (error) {
dev_err(&i2c->dev, "BU21013_RESET reg write failed\n"); dev_err(&client->dev, "BU21013_RESET reg write failed\n");
return retval; return error;
} }
msleep(RESET_DELAY); msleep(RESET_DELAY);
retval = i2c_smbus_write_byte_data(i2c, BU21013_SENSOR_0_7_REG, error = i2c_smbus_write_byte_data(client, BU21013_SENSOR_0_7_REG,
BU21013_SENSORS_EN_0_7); BU21013_SENSORS_EN_0_7);
if (retval < 0) { if (error) {
dev_err(&i2c->dev, "BU21013_SENSOR_0_7 reg write failed\n"); dev_err(&client->dev, "BU21013_SENSOR_0_7 reg write failed\n");
return retval; return error;
} }
retval = i2c_smbus_write_byte_data(i2c, BU21013_SENSOR_8_15_REG, error = i2c_smbus_write_byte_data(client, BU21013_SENSOR_8_15_REG,
BU21013_SENSORS_EN_8_15); BU21013_SENSORS_EN_8_15);
if (retval < 0) { if (error) {
dev_err(&i2c->dev, "BU21013_SENSOR_8_15 reg write failed\n"); dev_err(&client->dev, "BU21013_SENSOR_8_15 reg write failed\n");
return retval; return error;
} }
retval = i2c_smbus_write_byte_data(i2c, BU21013_SENSOR_16_23_REG, error = i2c_smbus_write_byte_data(client, BU21013_SENSOR_16_23_REG,
BU21013_SENSORS_EN_16_23); BU21013_SENSORS_EN_16_23);
if (retval < 0) { if (error) {
dev_err(&i2c->dev, "BU21013_SENSOR_16_23 reg write failed\n"); dev_err(&client->dev, "BU21013_SENSOR_16_23 reg write failed\n");
return retval; return error;
} }
retval = i2c_smbus_write_byte_data(i2c, BU21013_POS_MODE1_REG, error = i2c_smbus_write_byte_data(client, BU21013_POS_MODE1_REG,
(BU21013_POS_MODE1_0 | BU21013_POS_MODE1_1)); BU21013_POS_MODE1_0 |
if (retval < 0) { BU21013_POS_MODE1_1);
dev_err(&i2c->dev, "BU21013_POS_MODE1 reg write failed\n"); if (error) {
return retval; dev_err(&client->dev, "BU21013_POS_MODE1 reg write failed\n");
return error;
} }
retval = i2c_smbus_write_byte_data(i2c, BU21013_POS_MODE2_REG, error = i2c_smbus_write_byte_data(client, BU21013_POS_MODE2_REG,
(BU21013_POS_MODE2_ZERO | BU21013_POS_MODE2_AVG1 | BU21013_POS_MODE2_ZERO |
BU21013_POS_MODE2_AVG2 | BU21013_POS_MODE2_EN_RAW | BU21013_POS_MODE2_AVG1 |
BU21013_POS_MODE2_MULTI)); BU21013_POS_MODE2_AVG2 |
if (retval < 0) { BU21013_POS_MODE2_EN_RAW |
dev_err(&i2c->dev, "BU21013_POS_MODE2 reg write failed\n"); BU21013_POS_MODE2_MULTI);
return retval; if (error) {
dev_err(&client->dev, "BU21013_POS_MODE2 reg write failed\n");
return error;
} }
if (data->chip->ext_clk) if (ts->chip->ext_clk)
retval = i2c_smbus_write_byte_data(i2c, BU21013_CLK_MODE_REG, error = i2c_smbus_write_byte_data(client, BU21013_CLK_MODE_REG,
(BU21013_CLK_MODE_EXT | BU21013_CLK_MODE_CALIB)); BU21013_CLK_MODE_EXT |
BU21013_CLK_MODE_CALIB);
else else
retval = i2c_smbus_write_byte_data(i2c, BU21013_CLK_MODE_REG, error = i2c_smbus_write_byte_data(client, BU21013_CLK_MODE_REG,
(BU21013_CLK_MODE_DIV | BU21013_CLK_MODE_CALIB)); BU21013_CLK_MODE_DIV |
if (retval < 0) { BU21013_CLK_MODE_CALIB);
dev_err(&i2c->dev, "BU21013_CLK_MODE reg write failed\n"); if (error) {
return retval; dev_err(&client->dev, "BU21013_CLK_MODE reg write failed\n");
return error;
} }
retval = i2c_smbus_write_byte_data(i2c, BU21013_IDLE_REG, error = i2c_smbus_write_byte_data(client, BU21013_IDLE_REG,
(BU21013_IDLET_0 | BU21013_IDLE_INTERMIT_EN)); BU21013_IDLET_0 |
if (retval < 0) { BU21013_IDLE_INTERMIT_EN);
dev_err(&i2c->dev, "BU21013_IDLE reg write failed\n"); if (error) {
return retval; dev_err(&client->dev, "BU21013_IDLE reg write failed\n");
return error;
} }
retval = i2c_smbus_write_byte_data(i2c, BU21013_INT_MODE_REG, error = i2c_smbus_write_byte_data(client, BU21013_INT_MODE_REG,
BU21013_INT_MODE_LEVEL); BU21013_INT_MODE_LEVEL);
if (retval < 0) { if (error) {
dev_err(&i2c->dev, "BU21013_INT_MODE reg write failed\n"); dev_err(&client->dev, "BU21013_INT_MODE reg write failed\n");
return retval; return error;
} }
retval = i2c_smbus_write_byte_data(i2c, BU21013_FILTER_REG, error = i2c_smbus_write_byte_data(client, BU21013_FILTER_REG,
(BU21013_DELTA_0_6 | BU21013_DELTA_0_6 |
BU21013_FILTER_EN)); BU21013_FILTER_EN);
if (retval < 0) { if (error) {
dev_err(&i2c->dev, "BU21013_FILTER reg write failed\n"); dev_err(&client->dev, "BU21013_FILTER reg write failed\n");
return retval; return error;
} }
retval = i2c_smbus_write_byte_data(i2c, BU21013_TH_ON_REG, error = i2c_smbus_write_byte_data(client, BU21013_TH_ON_REG,
BU21013_TH_ON_5); BU21013_TH_ON_5);
if (retval < 0) { if (error) {
dev_err(&i2c->dev, "BU21013_TH_ON reg write failed\n"); dev_err(&client->dev, "BU21013_TH_ON reg write failed\n");
return retval; return error;
} }
retval = i2c_smbus_write_byte_data(i2c, BU21013_TH_OFF_REG, error = i2c_smbus_write_byte_data(client, BU21013_TH_OFF_REG,
BU21013_TH_OFF_4 | BU21013_TH_OFF_3); BU21013_TH_OFF_4 | BU21013_TH_OFF_3);
if (retval < 0) { if (error) {
dev_err(&i2c->dev, "BU21013_TH_OFF reg write failed\n"); dev_err(&client->dev, "BU21013_TH_OFF reg write failed\n");
return retval; return error;
} }
retval = i2c_smbus_write_byte_data(i2c, BU21013_GAIN_REG, error = i2c_smbus_write_byte_data(client, BU21013_GAIN_REG,
(BU21013_GAIN_0 | BU21013_GAIN_1)); BU21013_GAIN_0 | BU21013_GAIN_1);
if (retval < 0) { if (error) {
dev_err(&i2c->dev, "BU21013_GAIN reg write failed\n"); dev_err(&client->dev, "BU21013_GAIN reg write failed\n");
return retval; return error;
} }
retval = i2c_smbus_write_byte_data(i2c, BU21013_OFFSET_MODE_REG, error = i2c_smbus_write_byte_data(client, BU21013_OFFSET_MODE_REG,
BU21013_OFFSET_MODE_DEFAULT); BU21013_OFFSET_MODE_DEFAULT);
if (retval < 0) { if (error) {
dev_err(&i2c->dev, "BU21013_OFFSET_MODE reg write failed\n"); dev_err(&client->dev, "BU21013_OFFSET_MODE reg write failed\n");
return retval; return error;
} }
retval = i2c_smbus_write_byte_data(i2c, BU21013_XY_EDGE_REG, error = i2c_smbus_write_byte_data(client, BU21013_XY_EDGE_REG,
(BU21013_X_EDGE_0 | BU21013_X_EDGE_2 | BU21013_X_EDGE_0 |
BU21013_Y_EDGE_1 | BU21013_Y_EDGE_3)); BU21013_X_EDGE_2 |
if (retval < 0) { BU21013_Y_EDGE_1 |
dev_err(&i2c->dev, "BU21013_XY_EDGE reg write failed\n"); BU21013_Y_EDGE_3);
return retval; if (error) {
dev_err(&client->dev, "BU21013_XY_EDGE reg write failed\n");
return error;
} }
retval = i2c_smbus_write_byte_data(i2c, BU21013_DONE_REG, error = i2c_smbus_write_byte_data(client, BU21013_DONE_REG,
BU21013_DONE); BU21013_DONE);
if (retval < 0) { if (error) {
dev_err(&i2c->dev, "BU21013_REG_DONE reg write failed\n"); dev_err(&client->dev, "BU21013_REG_DONE reg write failed\n");
return retval; return error;
} }
return 0; return 0;
...@@ -414,16 +419,16 @@ static int bu21013_init_chip(struct bu21013_ts_data *data) ...@@ -414,16 +419,16 @@ static int bu21013_init_chip(struct bu21013_ts_data *data)
/** /**
* bu21013_free_irq() - frees IRQ registered for touchscreen * bu21013_free_irq() - frees IRQ registered for touchscreen
* @bu21013_data: device structure pointer * @ts: device structure pointer
* *
* This function signals interrupt thread to stop processing and * This function signals interrupt thread to stop processing and
* frees interrupt. * frees interrupt.
*/ */
static void bu21013_free_irq(struct bu21013_ts_data *bu21013_data) static void bu21013_free_irq(struct bu21013_ts *ts)
{ {
bu21013_data->touch_stopped = true; ts->touch_stopped = true;
wake_up(&bu21013_data->wait); wake_up(&ts->wait);
free_irq(bu21013_data->irq, bu21013_data); free_irq(ts->irq, ts);
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
...@@ -476,7 +481,7 @@ static int bu21013_probe(struct i2c_client *client, ...@@ -476,7 +481,7 @@ static int bu21013_probe(struct i2c_client *client,
{ {
const struct bu21013_platform_device *pdata = const struct bu21013_platform_device *pdata =
dev_get_platdata(&client->dev); dev_get_platdata(&client->dev);
struct bu21013_ts_data *bu21013_data; struct bu21013_ts *ts;
struct input_dev *in_dev; struct input_dev *in_dev;
int error; int error;
...@@ -492,58 +497,57 @@ static int bu21013_probe(struct i2c_client *client, ...@@ -492,58 +497,57 @@ static int bu21013_probe(struct i2c_client *client,
return PTR_ERR(pdata); return PTR_ERR(pdata);
} }
bu21013_data = kzalloc(sizeof(struct bu21013_ts_data), GFP_KERNEL); ts = kzalloc(sizeof(*ts), GFP_KERNEL);
in_dev = input_allocate_device(); in_dev = input_allocate_device();
if (!bu21013_data || !in_dev) { if (!ts || !in_dev) {
dev_err(&client->dev, "device memory alloc failed\n"); dev_err(&client->dev, "device memory alloc failed\n");
error = -ENOMEM; error = -ENOMEM;
goto err_free_mem; goto err_free_mem;
} }
/* Named "INT" on the chip, DT binding is "touch" */ /* Named "INT" on the chip, DT binding is "touch" */
bu21013_data->int_gpiod = gpiod_get(&client->dev, "touch", GPIOD_IN); ts->int_gpiod = gpiod_get(&client->dev, "touch", GPIOD_IN);
error = PTR_ERR_OR_ZERO(bu21013_data->int_gpiod); error = PTR_ERR_OR_ZERO(ts->int_gpiod);
if (error) { if (error) {
if (error != -EPROBE_DEFER) if (error != -EPROBE_DEFER)
dev_err(&client->dev, "failed to get INT GPIO\n"); dev_err(&client->dev, "failed to get INT GPIO\n");
goto err_free_mem; goto err_free_mem;
} }
gpiod_set_consumer_name(bu21013_data->int_gpiod, "BU21013 INT"); gpiod_set_consumer_name(ts->int_gpiod, "BU21013 INT");
bu21013_data->in_dev = in_dev; ts->in_dev = in_dev;
bu21013_data->chip = pdata; ts->chip = pdata;
bu21013_data->client = client; ts->client = client;
bu21013_data->irq = gpiod_to_irq(bu21013_data->int_gpiod); ts->irq = gpiod_to_irq(ts->int_gpiod);
bu21013_data->regulator = regulator_get(&client->dev, "avdd"); ts->regulator = regulator_get(&client->dev, "avdd");
if (IS_ERR(bu21013_data->regulator)) { if (IS_ERR(ts->regulator)) {
dev_err(&client->dev, "regulator_get failed\n"); dev_err(&client->dev, "regulator_get failed\n");
error = PTR_ERR(bu21013_data->regulator); error = PTR_ERR(ts->regulator);
goto err_put_int_gpio; goto err_put_int_gpio;
} }
error = regulator_enable(bu21013_data->regulator); error = regulator_enable(ts->regulator);
if (error < 0) { if (error < 0) {
dev_err(&client->dev, "regulator enable failed\n"); dev_err(&client->dev, "regulator enable failed\n");
goto err_put_regulator; goto err_put_regulator;
} }
bu21013_data->touch_stopped = false; ts->touch_stopped = false;
init_waitqueue_head(&bu21013_data->wait); init_waitqueue_head(&ts->wait);
/* Named "CS" on the chip, DT binding is "reset" */ /* Named "CS" on the chip, DT binding is "reset" */
bu21013_data->cs_gpiod = gpiod_get(&client->dev, "reset", ts->cs_gpiod = gpiod_get(&client->dev, "reset", GPIOD_OUT_HIGH);
GPIOD_OUT_HIGH); error = PTR_ERR_OR_ZERO(ts->cs_gpiod);
error = PTR_ERR_OR_ZERO(bu21013_data->cs_gpiod);
if (error) { if (error) {
if (error != -EPROBE_DEFER) if (error != -EPROBE_DEFER)
dev_err(&client->dev, "failed to get CS GPIO\n"); dev_err(&client->dev, "failed to get CS GPIO\n");
goto err_disable_regulator; goto err_disable_regulator;
} }
gpiod_set_consumer_name(bu21013_data->cs_gpiod, "BU21013 CS"); gpiod_set_consumer_name(ts->cs_gpiod, "BU21013 CS");
/* configure the touch panel controller */ /* configure the touch panel controller */
error = bu21013_init_chip(bu21013_data); error = bu21013_init_chip(ts);
if (error) { if (error) {
dev_err(&client->dev, "error in bu21013 config\n"); dev_err(&client->dev, "error in bu21013 config\n");
goto err_cs_disable; goto err_cs_disable;
...@@ -558,19 +562,19 @@ static int bu21013_probe(struct i2c_client *client, ...@@ -558,19 +562,19 @@ static int bu21013_probe(struct i2c_client *client,
__set_bit(EV_KEY, in_dev->evbit); __set_bit(EV_KEY, in_dev->evbit);
__set_bit(EV_ABS, in_dev->evbit); __set_bit(EV_ABS, in_dev->evbit);
input_set_abs_params(in_dev, ABS_MT_POSITION_X, 0, input_set_abs_params(in_dev, ABS_MT_POSITION_X,
pdata->touch_x_max, 0, 0); 0, pdata->touch_x_max, 0, 0);
input_set_abs_params(in_dev, ABS_MT_POSITION_Y, 0, input_set_abs_params(in_dev, ABS_MT_POSITION_Y,
pdata->touch_y_max, 0, 0); 0, pdata->touch_y_max, 0, 0);
input_set_drvdata(in_dev, bu21013_data); input_set_drvdata(in_dev, ts);
error = request_threaded_irq(bu21013_data->irq, NULL, bu21013_gpio_irq, error = request_threaded_irq(ts->irq, NULL, bu21013_gpio_irq,
IRQF_TRIGGER_FALLING | IRQF_SHARED | IRQF_TRIGGER_FALLING | IRQF_SHARED |
IRQF_ONESHOT, IRQF_ONESHOT,
DRIVER_TP, bu21013_data); DRIVER_TP, ts);
if (error) { if (error) {
dev_err(&client->dev, "request irq %d failed\n", dev_err(&client->dev, "request irq %d failed\n",
bu21013_data->irq); ts->irq);
goto err_cs_disable; goto err_cs_disable;
} }
...@@ -581,24 +585,24 @@ static int bu21013_probe(struct i2c_client *client, ...@@ -581,24 +585,24 @@ static int bu21013_probe(struct i2c_client *client,
} }
device_init_wakeup(&client->dev, pdata->wakeup); device_init_wakeup(&client->dev, pdata->wakeup);
i2c_set_clientdata(client, bu21013_data); i2c_set_clientdata(client, ts);
return 0; return 0;
err_free_irq: err_free_irq:
bu21013_free_irq(bu21013_data); bu21013_free_irq(ts);
err_cs_disable: err_cs_disable:
gpiod_set_value(bu21013_data->cs_gpiod, 0); gpiod_set_value(ts->cs_gpiod, 0);
gpiod_put(bu21013_data->cs_gpiod); gpiod_put(ts->cs_gpiod);
err_disable_regulator: err_disable_regulator:
regulator_disable(bu21013_data->regulator); regulator_disable(ts->regulator);
err_put_regulator: err_put_regulator:
regulator_put(bu21013_data->regulator); regulator_put(ts->regulator);
err_put_int_gpio: err_put_int_gpio:
gpiod_put(bu21013_data->int_gpiod); gpiod_put(ts->int_gpiod);
err_free_mem: err_free_mem:
input_free_device(in_dev); input_free_device(in_dev);
kfree(bu21013_data); kfree(ts);
return error; return error;
} }
...@@ -611,21 +615,21 @@ static int bu21013_probe(struct i2c_client *client, ...@@ -611,21 +615,21 @@ static int bu21013_probe(struct i2c_client *client,
*/ */
static int bu21013_remove(struct i2c_client *client) static int bu21013_remove(struct i2c_client *client)
{ {
struct bu21013_ts_data *bu21013_data = i2c_get_clientdata(client); struct bu21013_ts *ts = i2c_get_clientdata(client);
bu21013_free_irq(bu21013_data); bu21013_free_irq(ts);
gpiod_set_value(bu21013_data->cs_gpiod, 0); gpiod_set_value(ts->cs_gpiod, 0);
gpiod_put(bu21013_data->cs_gpiod); gpiod_put(ts->cs_gpiod);
input_unregister_device(bu21013_data->in_dev); input_unregister_device(ts->in_dev);
regulator_disable(bu21013_data->regulator); regulator_disable(ts->regulator);
regulator_put(bu21013_data->regulator); regulator_put(ts->regulator);
gpiod_put(bu21013_data->int_gpiod); gpiod_put(ts->int_gpiod);
kfree(bu21013_data); kfree(ts);
return 0; return 0;
} }
...@@ -640,16 +644,16 @@ static int bu21013_remove(struct i2c_client *client) ...@@ -640,16 +644,16 @@ static int bu21013_remove(struct i2c_client *client)
*/ */
static int bu21013_suspend(struct device *dev) static int bu21013_suspend(struct device *dev)
{ {
struct bu21013_ts_data *bu21013_data = dev_get_drvdata(dev); struct bu21013_ts *ts = dev_get_drvdata(dev);
struct i2c_client *client = bu21013_data->client; struct i2c_client *client = ts->client;
bu21013_data->touch_stopped = true; ts->touch_stopped = true;
if (device_may_wakeup(&client->dev)) if (device_may_wakeup(&client->dev))
enable_irq_wake(bu21013_data->irq); enable_irq_wake(ts->irq);
else else
disable_irq(bu21013_data->irq); disable_irq(ts->irq);
regulator_disable(bu21013_data->regulator); regulator_disable(ts->regulator);
return 0; return 0;
} }
...@@ -663,28 +667,28 @@ static int bu21013_suspend(struct device *dev) ...@@ -663,28 +667,28 @@ static int bu21013_suspend(struct device *dev)
*/ */
static int bu21013_resume(struct device *dev) static int bu21013_resume(struct device *dev)
{ {
struct bu21013_ts_data *bu21013_data = dev_get_drvdata(dev); struct bu21013_ts *ts = dev_get_drvdata(dev);
struct i2c_client *client = bu21013_data->client; struct i2c_client *client = ts->client;
int retval; int retval;
retval = regulator_enable(bu21013_data->regulator); retval = regulator_enable(ts->regulator);
if (retval < 0) { if (retval < 0) {
dev_err(&client->dev, "bu21013 regulator enable failed\n"); dev_err(&client->dev, "bu21013 regulator enable failed\n");
return retval; return retval;
} }
retval = bu21013_init_chip(bu21013_data); retval = bu21013_init_chip(ts);
if (retval < 0) { if (retval < 0) {
dev_err(&client->dev, "bu21013 controller config failed\n"); dev_err(&client->dev, "bu21013 controller config failed\n");
return retval; return retval;
} }
bu21013_data->touch_stopped = false; ts->touch_stopped = false;
if (device_may_wakeup(&client->dev)) if (device_may_wakeup(&client->dev))
disable_irq_wake(bu21013_data->irq); disable_irq_wake(ts->irq);
else else
enable_irq(bu21013_data->irq); enable_irq(ts->irq);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7