From: Jiada Wang <jiada_wang@mentor.com>
To: <nick@shmanahar.org>, <dmitry.torokhov@gmail.com>,
<jikos@kernel.org>, <benjamin.tissoires@redhat.com>,
<rydberg@bitmath.org>
Cc: <linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<jiada_wang@mentor.com>
Subject: [PATCH v3 31/49] Input: atmel_mxt_ts - eliminate data->raw_info_block
Date: Tue, 17 Sep 2019 18:40:32 +0900 [thread overview]
Message-ID: <20190917094050.18771-3-jiada_wang@mentor.com> (raw)
In-Reply-To: <20190917094050.18771-1-jiada_wang@mentor.com>
Dynamically allocated in mxt_read_info_block() buffer buf is assigned
both to data->info and data->raw_info_block, having both data->info
and data->raw_info_block is redundant and confusing.
This patch eliminates data->raw_info_block.
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
Signed-off-by: George G. Davis <george_davis@mentor.com>
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
drivers/input/touchscreen/atmel_mxt_ts.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index b3152aaaed63..560fe8a3bf62 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -323,7 +323,6 @@ struct mxt_data {
char phys[64]; /* device physical location */
struct mxt_object *object_table;
struct mxt_info *info;
- void *raw_info_block;
unsigned int irq;
unsigned int max_x;
unsigned int max_y;
@@ -2070,9 +2069,8 @@ static void mxt_free_object_table(struct mxt_data *data)
v4l2_device_unregister(&data->dbg.v4l2);
#endif
data->object_table = NULL;
+ kfree(data->info);
data->info = NULL;
- kfree(data->raw_info_block);
- data->raw_info_block = NULL;
kfree(data->msg_buf);
data->msg_buf = NULL;
data->T5_address = 0;
@@ -2241,7 +2239,7 @@ static int mxt_read_info_block(struct mxt_data *data)
u8 *crc_ptr;
/* If info block already allocated, free it */
- if (data->raw_info_block)
+ if (data->info)
mxt_free_object_table(data);
/* Read 7-byte ID information block starting at address 0 */
@@ -2292,7 +2290,6 @@ static int mxt_read_info_block(struct mxt_data *data)
goto err_free_mem;
}
- data->raw_info_block = id_buf;
data->info = (struct mxt_info *)id_buf;
dev_info(&client->dev,
--
2.19.2
next prev parent reply other threads:[~2019-09-17 9:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-17 9:40 [PATCH v3 29/49] Input: atmel_mxt_ts - implement debug output for messages Jiada Wang
2019-09-17 9:40 ` [PATCH v3 30/49] Input: atmel_mxt_ts - implement improved debug message interface Jiada Wang
2019-09-17 9:40 ` Jiada Wang [this message]
2019-09-17 9:40 ` [PATCH v3 32/49] Input: atmel_mxt_ts - Change call-points of mxt_free_* functions Jiada Wang
2019-09-17 9:40 ` [PATCH v3 33/49] Input: atmel_mxt_ts - rely on calculated_crc rather than file config_crc Jiada Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190917094050.18771-3-jiada_wang@mentor.com \
--to=jiada_wang@mentor.com \
--cc=benjamin.tissoires@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nick@shmanahar.org \
--cc=rydberg@bitmath.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).