iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

greybus: manifest: refactor cport-descriptor release

Browse Source 
Add helper function to release cport-descriptors with a given bundle id.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Johan Hovold 2015-11-25 15:59:25 +01:00 committed by Greg Kroah-Hartman
parent e1442f6910
commit f2152eb33d
1 changed files with 17 additions and 8 deletions

25
drivers/staging/greybus/manifest.c

@ -60,6 +60,22 @@ static void release_manifest_descriptors(struct gb_interface *intf)
release_manifest_descriptor(descriptor); release_manifest_descriptor(descriptor);
} }
static void release_cport_descriptors(struct list_head *head, u8 bundle_id)
{
struct manifest_desc *desc, *tmp;
struct greybus_descriptor_cport *desc_cport;
list_for_each_entry_safe(desc, tmp, head, links) {
desc_cport = desc->data;
if (desc->type != GREYBUS_TYPE_CPORT)
continue;
if (desc_cport->bundle == bundle_id)
release_manifest_descriptor(desc);
}
}
static struct manifest_desc *get_next_bundle_desc(struct gb_interface *intf) static struct manifest_desc *get_next_bundle_desc(struct gb_interface *intf)
{ {
struct manifest_desc *descriptor; struct manifest_desc *descriptor;
@ -275,14 +291,7 @@ exit:
* Free all cports for this bundle to avoid 'excess descriptors' * Free all cports for this bundle to avoid 'excess descriptors'
* warnings. * warnings.
*/ */
list_for_each_entry_safe(desc, next, &intf->manifest_descs, links) { release_cport_descriptors(&intf->manifest_descs, bundle_id);
struct greybus_descriptor_cport *desc_cport = desc->data;
if (desc->type != GREYBUS_TYPE_CPORT)
continue;
if (desc_cport->bundle == bundle_id)
release_manifest_descriptor(desc);
}
return 0; /* Error; count should also be 0 */ return 0; /* Error; count should also be 0 */
} }