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

Commit 7326e07b authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

greybus: interface: register control device at hotplug 



Make sure to register also the control device along with any bundles
when registering an interface.

Note that we currently ignore failures to register the control device
just as we do for bundle devices.

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

drivers/staging/greybus/control.c

+21 −0
Original line number Diff line number Diff line
@@ -294,6 +294,27 @@ void gb_control_disable(struct gb_control *control) 
	gb_connection_disable(control->connection);

}



int gb_control_add(struct gb_control *control)

{

	int ret;



	ret = device_add(&control->dev);

	if (ret) {

		dev_err(&control->dev,

				"failed to register control device: %d\n",

				ret);

		return ret;

	}



	return 0;

}



void gb_control_del(struct gb_control *control)

{

	if (device_is_registered(&control->dev))

		device_del(&control->dev);

}



void gb_control_put(struct gb_control *control)

{

	put_device(&control->dev);

drivers/staging/greybus/control.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ struct gb_control { 
struct gb_control *gb_control_create(struct gb_interface *intf);

int gb_control_enable(struct gb_control *control);

void gb_control_disable(struct gb_control *control);

int gb_control_add(struct gb_control *control);

void gb_control_del(struct gb_control *control);

void gb_control_put(struct gb_control *control);



int gb_control_get_bundle_versions(struct gb_control *control);

drivers/staging/greybus/interface.c

+4 −0
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ void gb_interface_disable(struct gb_interface *intf) 
	list_for_each_entry_safe(bundle, next, &intf->bundles, links)

		gb_bundle_destroy(bundle);



	gb_control_del(intf->control);

	gb_control_disable(intf->control);

}
@@ -557,6 +558,9 @@ int gb_interface_add(struct gb_interface *intf) 
	dev_info(&intf->dev, "DDBL1 Manufacturer=0x%08x, Product=0x%08x\n",

		 intf->ddbl1_manufacturer_id, intf->ddbl1_product_id);



	/* NOTE: ignoring errors for now */

	gb_control_add(intf->control);



	list_for_each_entry_safe_reverse(bundle, tmp, &intf->bundles, links) {

		ret = gb_bundle_add(bundle);

		if (ret) {