[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/5] usb-mtp: remove usb_mtp_object_free_one
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 4/5] usb-mtp: remove usb_mtp_object_free_one |
Date: |
Tue, 2 Apr 2019 08:46:38 +0200 |
From: Bandan Das <address@hidden>
This function is used in the delete path only and can
be replaced by a call to usb_mtp_object_free.
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Bandan Das <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-mtp.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 91b820baafd8..4dc1317e2e49 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -1150,16 +1150,6 @@ enum {
DELETE_PARTIAL = (DELETE_FAILURE | DELETE_SUCCESS),
};
-/* Assumes that children, if any, have been already freed */
-static void usb_mtp_object_free_one(MTPState *s, MTPObject *o)
-{
- assert(o->nchildren == 0);
- QTAILQ_REMOVE(&s->objects, o, next);
- g_free(o->name);
- g_free(o->path);
- g_free(o);
-}
-
static int usb_mtp_deletefn(MTPState *s, MTPObject *o, uint32_t trans)
{
MTPObject *iter, *iter2;
@@ -1181,14 +1171,14 @@ static int usb_mtp_deletefn(MTPState *s, MTPObject *o,
uint32_t trans)
if (remove(o->path)) {
ret |= DELETE_FAILURE;
} else {
- usb_mtp_object_free_one(s, o);
+ usb_mtp_object_free(s, o);
ret |= DELETE_SUCCESS;
}
} else if (o->format == FMT_ASSOCIATION) {
if (rmdir(o->path)) {
ret |= DELETE_FAILURE;
} else {
- usb_mtp_object_free_one(s, o);
+ usb_mtp_object_free(s, o);
ret |= DELETE_SUCCESS;
}
}
--
2.18.1
- [Qemu-devel] [PULL 0/5] Fixes 20190402 patches, Gerd Hoffmann, 2019/04/02
- [Qemu-devel] [PULL 2/5] hw/usb/bus.c: Handle "no speed matched" case in usb_mask_to_str(), Gerd Hoffmann, 2019/04/02
- [Qemu-devel] [PULL 1/5] Revert "audio: fix pc speaker init", Gerd Hoffmann, 2019/04/02
- [Qemu-devel] [PULL 5/5] audio: fix audio timer rate conversion bug, Gerd Hoffmann, 2019/04/02
- [Qemu-devel] [PULL 4/5] usb-mtp: remove usb_mtp_object_free_one,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 3/5] usb-mtp: fix return status of delete, Gerd Hoffmann, 2019/04/02
- Re: [Qemu-devel] [PULL 0/5] Fixes 20190402 patches, Peter Maydell, 2019/04/02