HID: alps: delete unnecessary struct u1_dev devInfo

Delete "struct u1_dev devInfo" structure, because u1_dev structure is already
declared as "struct u1_dev *data".

[jkosina@suse.cz: rewrite changelog]
Signed-off-by: Masaki Ota <masaki.ota@jp.alps.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c
index ed9c0ea..519bfcf 100644 (file)
--- a/drivers/hid/hid-alps.c
+++ b/drivers/hid/hid-alps.c
@@ -259,7 +259,6 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
 {
        struct u1_dev *data = hid_get_drvdata(hdev);
        struct input_dev *input = hi->input, *input2;
-       struct u1_dev devInfo;
        int ret;
        int res_x, res_y, i;
 
@@ -275,58 +274,58 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
 
        /* Device initialization */
        ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,
-                       &devInfo.dev_ctrl, 0, true);
+                       &data->dev_ctrl, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_DEV_CTRL_1 (%d)\n", ret);
                goto exit;
        }
 
-       devInfo.dev_ctrl &= ~U1_DISABLE_DEV;
-       devInfo.dev_ctrl |= U1_TP_ABS_MODE;
+       data->dev_ctrl &= ~U1_DISABLE_DEV;
+       data->dev_ctrl |= U1_TP_ABS_MODE;
        ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,
-                       NULL, devInfo.dev_ctrl, false);
+                       NULL, data->dev_ctrl, false);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed to change TP mode (%d)\n", ret);
                goto exit;
        }
 
        ret = u1_read_write_register(hdev, ADDRESS_U1_NUM_SENS_X,
-                       &devInfo.sen_line_num_x, 0, true);
+                       &data->sen_line_num_x, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_NUM_SENS_X (%d)\n", ret);
                goto exit;
        }
 
        ret = u1_read_write_register(hdev, ADDRESS_U1_NUM_SENS_Y,
-                       &devInfo.sen_line_num_y, 0, true);
+                       &data->sen_line_num_y, 0, true);
                if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_NUM_SENS_Y (%d)\n", ret);
                goto exit;
        }
 
        ret = u1_read_write_register(hdev, ADDRESS_U1_PITCH_SENS_X,
-                       &devInfo.pitch_x, 0, true);
+                       &data->pitch_x, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_PITCH_SENS_X (%d)\n", ret);
                goto exit;
        }
 
        ret = u1_read_write_register(hdev, ADDRESS_U1_PITCH_SENS_Y,
-                       &devInfo.pitch_y, 0, true);
+                       &data->pitch_y, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_PITCH_SENS_Y (%d)\n", ret);
                goto exit;
        }
 
        ret = u1_read_write_register(hdev, ADDRESS_U1_RESO_DWN_ABS,
-               &devInfo.resolution, 0, true);
+               &data->resolution, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_RESO_DWN_ABS (%d)\n", ret);
                goto exit;
        }
 
        ret = u1_read_write_register(hdev, ADDRESS_U1_PAD_BTN,
-                       &devInfo.btn_info, 0, true);
+                       &data->btn_info, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_PAD_BTN (%d)\n", ret);
                goto exit;
@@ -334,29 +333,29 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
 
        /* Check StickPointer device */
        ret = u1_read_write_register(hdev, ADDRESS_U1_DEVICE_TYP,
-                       &devInfo.dev_type, 0, true);
+                       &data->dev_type, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_DEVICE_TYP (%d)\n", ret);
                goto exit;
        }
 
-       devInfo.x_active_len_mm =
-               (devInfo.pitch_x * (devInfo.sen_line_num_x - 1)) / 10;
-       devInfo.y_active_len_mm =
-               (devInfo.pitch_y * (devInfo.sen_line_num_y - 1)) / 10;
+       data->x_active_len_mm =
+               (data->pitch_x * (data->sen_line_num_x - 1)) / 10;
+       data->y_active_len_mm =
+               (data->pitch_y * (data->sen_line_num_y - 1)) / 10;
 
-       devInfo.x_max =
-               (devInfo.resolution << 2) * (devInfo.sen_line_num_x - 1);
-       devInfo.y_max =
-               (devInfo.resolution << 2) * (devInfo.sen_line_num_y - 1);
+       data->x_max =
+               (data->resolution << 2) * (data->sen_line_num_x - 1);
+       data->y_max =
+               (data->resolution << 2) * (data->sen_line_num_y - 1);
 
        __set_bit(EV_ABS, input->evbit);
-       input_set_abs_params(input, ABS_MT_POSITION_X, 1, devInfo.x_max, 0, 0);
-       input_set_abs_params(input, ABS_MT_POSITION_Y, 1, devInfo.y_max, 0, 0);
+       input_set_abs_params(input, ABS_MT_POSITION_X, 1, data->x_max, 0, 0);
+       input_set_abs_params(input, ABS_MT_POSITION_Y, 1, data->y_max, 0, 0);
 
-       if (devInfo.x_active_len_mm && devInfo.y_active_len_mm) {
-               res_x = (devInfo.x_max - 1) / devInfo.x_active_len_mm;
-               res_y = (devInfo.y_max - 1) / devInfo.y_active_len_mm;
+       if (data->x_active_len_mm && data->y_active_len_mm) {
+               res_x = (data->x_max - 1) / data->x_active_len_mm;
+               res_y = (data->y_max - 1) / data->y_active_len_mm;
 
                input_abs_set_res(input, ABS_MT_POSITION_X, res_x);
                input_abs_set_res(input, ABS_MT_POSITION_Y, res_y);
@@ -367,20 +366,20 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
        input_mt_init_slots(input, MAX_TOUCHES, INPUT_MT_POINTER);
 
        __set_bit(EV_KEY, input->evbit);
-       if ((devInfo.btn_info & 0x0F) == (devInfo.btn_info & 0xF0) >> 4) {
-               devInfo.btn_cnt = (devInfo.btn_info & 0x0F);
+       if ((data->btn_info & 0x0F) == (data->btn_info & 0xF0) >> 4) {
+               data->btn_cnt = (data->btn_info & 0x0F);
        } else {
                /* Button pad */
-               devInfo.btn_cnt = 1;
+               data->btn_cnt = 1;
                __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
        }
 
-       for (i = 0; i < devInfo.btn_cnt; i++)
+       for (i = 0; i < data->btn_cnt; i++)
                __set_bit(BTN_LEFT + i, input->keybit);
 
 
        /* Stick device initialization */
-       if (devInfo.dev_type & U1_DEVTYPE_SP_SUPPORT) {
+       if (data->dev_type & U1_DEVTYPE_SP_SUPPORT) {
 
                input2 = input_allocate_device();
                if (!input2) {
@@ -390,9 +389,9 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
 
                data->input2 = input2;
 
-               devInfo.dev_ctrl |= U1_SP_ABS_MODE;
+               data->dev_ctrl |= U1_SP_ABS_MODE;
                ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,
-                       NULL, devInfo.dev_ctrl, false);
+                       NULL, data->dev_ctrl, false);
                if (ret < 0) {
                        dev_err(&hdev->dev, "failed SP mode (%d)\n", ret);
                        input_free_device(input2);
@@ -400,7 +399,7 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
                }
 
                ret = u1_read_write_register(hdev, ADDRESS_U1_SP_BTN,
-                       &devInfo.sp_btn_info, 0, true);
+                       &data->sp_btn_info, 0, true);
                if (ret < 0) {
                        dev_err(&hdev->dev, "failed U1_SP_BTN (%d)\n", ret);
                        input_free_device(input2);
@@ -416,8 +415,8 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
                input2->dev.parent = input->dev.parent;
 
                __set_bit(EV_KEY, input2->evbit);
-               devInfo.sp_btn_cnt = (devInfo.sp_btn_info & 0x0F);
-               for (i = 0; i < devInfo.sp_btn_cnt; i++)
+               data->sp_btn_cnt = (data->sp_btn_info & 0x0F);
+               for (i = 0; i < data->sp_btn_cnt; i++)
                        __set_bit(BTN_LEFT + i, input2->keybit);
 
                __set_bit(EV_REL, input2->evbit);