| Message ID | 20240620145139.1135899-1-denkenz@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 583e5e62a6ec0bd2fb4007595a703d2d8be56536 |
| Headers | show |
| Series | [v3,01/33] qmi: Remove qmi_free() | expand |
Hello: This series was applied to ofono.git (master) by Denis Kenzior <denkenz@gmail.com>: On Thu, 20 Jun 2024 09:50:48 -0500 you wrote: > This was just a simple wrapper around l_free, get rid of it. > --- > drivers/qmimodem/devinfo.c | 8 ++++---- > drivers/qmimodem/qmi.c | 5 ----- > drivers/qmimodem/qmi.h | 2 -- > drivers/qmimodem/sim-legacy.c | 6 +++--- > drivers/qmimodem/sim.c | 2 +- > 5 files changed, 8 insertions(+), 15 deletions(-) Here is the summary with links: - [v3,01/33] qmi: Remove qmi_free() https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=583e5e62a6ec - [v3,02/33] qmi: Rename qmi_result_func_t https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=e1815f98abe0 - [v3,03/33] qmi: Drop unused major/minor information https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=526316336d75 - [v3,04/33] qmi: Add qmi_qrtr_node_get_service https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=dd1ddbf23341 - [v3,05/33] plugins: Add new qrtrqmi modem driver https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=8da4495519cf - [v3,06/33] gobi: Use correct attribute name in docs https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=2d6528dbbdf5 - [v3,07/33] udevng: Use new qrtrqmi driver for MHI and SoC modems https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=7b735cb51b13 - [v3,08/33] gobi: Remove qrtr support https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=69335b285ac8 - [v3,09/33] udevng: Do not set DeviceProtocol https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=cbc3bbeb8542 - [v3,10/33] unit: Rename device to node https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=8612c1d6c9b3 - [v3,11/33] qmi: Rename qmi_device_new_qrtr to qmi_qrtr_node_new https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=0afd9e1df727 - [v3,12/33] qmi: Rename qmi_device_new_qmux to qmi_qmux_device_new https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=b55beaaa7978 - [v3,13/33] unit: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=d0e8bb9c76b6 - [v3,14/33] qmi: qmux: Make shared service creation generic https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=c047bfc9d600 - [v3,15/33] qmi: Rename qmi_device_get_service_version https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=4c70eaa29f67 - [v3,16/33] qmi: sms: Require at WMS version 1.2+ https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=9d2a30df34e6 - [v3,17/33] qmi: Rework qmi_service_get_version https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=86809d38ba1c - [v3,18/33] qmi: break up qmi_device_free into qrtr & qmux variants https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=bfda30d7f142 - [v3,19/33] qmi: Convert DBG statements to __debug_device https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=416cdbd3dba9 - [v3,20/33] qmi: introduce qmi_qrtr_node_lookup https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=8a645862d936 - [v3,21/33] qmi: split qmi_device_has_service into QRTR and QMUX version https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=6d45ba559524 - [v3,22/33] qmi: split qmi_device_set_debug into QRTR and QMUX versions https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=1f7adcd84a3f - [v3,23/33] qmi: Make qmi_qrtr_node methods take struct qmi_qrtr_node https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=674ff0810297 - [v3,24/33] qmi: Move expected data format handling into gobi https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=9dc730546f9a - [v3,25/33] qmi: Rename and refactor qmi_device_discover https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=217b57328473 - [v3,26/33] qmi: Rename qmi_device_shutdown https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=2e2a41ad4bf7 - [v3,27/33] qmi: Rename qmi_device_qmux to qmi_qmux_device https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=3407d0f17684 - [v3,28/33] qmi: Make qmux methods operate on 'qmi_qmux_device' https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=828d4841ecad - [v3,29/33] qmi: combine service_send_data into qmi_request https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=5543a8109fba - [v3,30/33] qmi: combine qmux_client_create_data into qmi_request https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=4592bf181a41 - [v3,31/33] gprs: Fix memory leak https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=1d6b11ef2b42 - [v3,32/33] qmi:gprs: Don't fail on unsupported INDICATION_REGISTER https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=c1f4a11f1c9c - [v3,33/33] qmi: non-premultiplexed MHI devices https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=27c79da4946f You are awesome, thank you!
diff --git a/drivers/qmimodem/devinfo.c b/drivers/qmimodem/devinfo.c index 2e514cfa3265..fd1ca3ceb2dd 100644 --- a/drivers/qmimodem/devinfo.c +++ b/drivers/qmimodem/devinfo.c @@ -45,7 +45,7 @@ static void string_cb(struct qmi_result *result, void *user_data) CALLBACK_WITH_SUCCESS(cb, str, cbd->data); - qmi_free(str); + l_free(str); } static void qmi_query_manufacturer(struct ofono_devinfo *devinfo, @@ -136,9 +136,9 @@ static void get_ids_cb(struct qmi_result *result, void *user_data) else CALLBACK_WITH_FAILURE(cb, NULL, cbd->data); - qmi_free(esn); - qmi_free(imei); - qmi_free(meid); + l_free(esn); + l_free(imei); + l_free(meid); } static void qmi_query_serial(struct ofono_devinfo *devinfo, diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c index 91469dc2e00c..632f647e5ea7 100644 --- a/drivers/qmimodem/qmi.c +++ b/drivers/qmimodem/qmi.c @@ -181,11 +181,6 @@ struct qmi_tlv_hdr { } __attribute__ ((packed)); #define QMI_TLV_HDR_SIZE 3 -void qmi_free(void *ptr) -{ - l_free(ptr); -} - static bool qmi_service_info_matches(const void *data, const void *user) { const struct qmi_service_info *info = data; diff --git a/drivers/qmimodem/qmi.h b/drivers/qmimodem/qmi.h index 821e54443658..de6238f25e62 100644 --- a/drivers/qmimodem/qmi.h +++ b/drivers/qmimodem/qmi.h @@ -56,8 +56,6 @@ enum qmi_data_endpoint_type { QMI_DATA_ENDPOINT_TYPE_BAM_DMUX = 0x05, }; -void qmi_free(void *ptr); - typedef void (*qmi_destroy_func_t)(void *user_data); diff --git a/drivers/qmimodem/sim-legacy.c b/drivers/qmimodem/sim-legacy.c index 1feaf86976c6..4c909f7f4ae4 100644 --- a/drivers/qmimodem/sim-legacy.c +++ b/drivers/qmimodem/sim-legacy.c @@ -71,14 +71,14 @@ static void get_iccid_cb(struct qmi_result *result, void *user_data) len = strlen(str); if (len > 20) { - qmi_free(str); + l_free(str); CALLBACK_WITH_FAILURE(cb, NULL, 0, cbd->data); return; } sim_encode_bcd_number(str, iccid); iccid_len = len / 2; - qmi_free(str); + l_free(str); CALLBACK_WITH_SUCCESS(cb, iccid, iccid_len, cbd->data); } @@ -128,7 +128,7 @@ static void get_imsi_cb(struct qmi_result *result, void *user_data) CALLBACK_WITH_SUCCESS(cb, str, cbd->data); - qmi_free(str); + l_free(str); } static void qmi_read_imsi(struct ofono_sim *sim, diff --git a/drivers/qmimodem/sim.c b/drivers/qmimodem/sim.c index 876274fa87b4..1fffae27f63e 100644 --- a/drivers/qmimodem/sim.c +++ b/drivers/qmimodem/sim.c @@ -427,7 +427,7 @@ static void get_imsi_cb(struct qmi_result *result, void *user_data) CALLBACK_WITH_SUCCESS(cb, str, cbd->data); - qmi_free(str); + l_free(str); } static void qmi_read_imsi(struct ofono_sim *sim,