Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 844fcbfe authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

greybus: svc: refactor interface re-enable 



Add interface re-enable helper that is used during mode switch to
disable and re-enable (enumerate) an interface.

Signed-off-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent deba0c03

drivers/staging/greybus/svc.c

+19 −7
Original line number Diff line number Diff line
@@ -665,6 +665,24 @@ static int gb_svc_hello(struct gb_operation *op) 
	return 0;

}



static void gb_svc_intf_reenable(struct gb_svc *svc, struct gb_interface *intf)

{

	int ret;



	/* Mark as disconnected to prevent I/O during disable. */

	intf->disconnected = true;

	gb_interface_disable(intf);

	intf->disconnected = false;



	ret = gb_interface_enable(intf);

	if (ret) {

		dev_err(&svc->dev, "failed to enable interface %u: %d\n",

				intf->interface_id, ret);



		gb_interface_deactivate(intf);

	}

}



static void gb_svc_process_intf_hotplug(struct gb_operation *operation)

{

	struct gb_svc_intf_hotplug_request *request;
@@ -686,12 +704,7 @@ static void gb_svc_process_intf_hotplug(struct gb_operation *operation) 
		dev_info(&svc->dev, "mode switch detected on interface %u\n",

				intf_id);



		/* Mark as disconnected to prevent I/O during disable. */

		intf->disconnected = true;

		gb_interface_disable(intf);

		intf->disconnected = false;



		goto enable_interface;

		return gb_svc_intf_reenable(svc, intf);

	}



	intf = gb_interface_create(hd, intf_id);
@@ -713,7 +726,6 @@ static void gb_svc_process_intf_hotplug(struct gb_operation *operation) 
	if (ret)

		goto err_interface_deactivate;



enable_interface:

	ret = gb_interface_enable(intf);

	if (ret) {

		dev_err(&svc->dev, "failed to enable interface %u: %d\n",