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

Commit c2012ec0 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Jiri Kosina
Browse files

HID: intel-ish-hid: Simplify ishtp_cl_link() 



All callers will only use ISHTP_HOST_CLIENT_ID_ANY, so get rid of
option to pass this additional id.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 7ab21842

drivers/hid/intel-ish-hid/ishtp-hid-client.c

+1 −1
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ static int hid_ishtp_cl_init(struct ishtp_cl *hid_ishtp_cl, int reset) 
	dev_dbg(cl_data_to_dev(client_data), "%s\n", __func__);

	hid_ishtp_trace(client_data,  "%s reset flag: %d\n", __func__, reset);



	rv = ishtp_cl_link(hid_ishtp_cl, ISHTP_HOST_CLIENT_ID_ANY);

	rv = ishtp_cl_link(hid_ishtp_cl);

	if (rv) {

		dev_err(cl_data_to_dev(client_data),

			"ishtp_cl_link failed\n");

drivers/hid/intel-ish-hid/ishtp/client.c

+4 −10
Original line number Diff line number Diff line
@@ -168,9 +168,6 @@ EXPORT_SYMBOL(ishtp_cl_free); 
/**

 * ishtp_cl_link() - Reserve a host id and link the client instance

 * @cl: client device instance

 * @id: host client id to use. It can be ISHTP_HOST_CLIENT_ID_ANY if any

 *	id from the available can be used

 *

 *

 * This allocates a single bit in the hostmap. This function will make sure

 * that not many client sessions are opened at the same time. Once allocated
@@ -179,11 +176,11 @@ EXPORT_SYMBOL(ishtp_cl_free); 
 *

 * Return: 0 or error code on failure

 */

int ishtp_cl_link(struct ishtp_cl *cl, int id)

int ishtp_cl_link(struct ishtp_cl *cl)

{

	struct ishtp_device *dev;

	unsigned long flags, flags_cl;

	int	ret = 0;

	int id, ret = 0;



	if (WARN_ON(!cl || !cl->dev))

		return -EINVAL;
@@ -197,10 +194,7 @@ int ishtp_cl_link(struct ishtp_cl *cl, int id) 
		goto unlock_dev;

	}



	/* If Id is not assigned get one*/

	if (id == ISHTP_HOST_CLIENT_ID_ANY)

		id = find_first_zero_bit(dev->host_clients_map,

			ISHTP_CLIENTS_MAX);

	id = find_first_zero_bit(dev->host_clients_map, ISHTP_CLIENTS_MAX);



	if (id >= ISHTP_CLIENTS_MAX) {

		spin_unlock_irqrestore(&dev->device_lock, flags);

drivers/hid/intel-ish-hid/ishtp/client.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static inline bool ishtp_cl_cmp_id(const struct ishtp_cl *cl1, 
/* exported functions from ISHTP under client management scope */

struct ishtp_cl *ishtp_cl_allocate(struct ishtp_cl_device *cl_device);

void ishtp_cl_free(struct ishtp_cl *cl);

int ishtp_cl_link(struct ishtp_cl *cl, int id);

int ishtp_cl_link(struct ishtp_cl *cl);

void ishtp_cl_unlink(struct ishtp_cl *cl);

int ishtp_cl_disconnect(struct ishtp_cl *cl);

int ishtp_cl_connect(struct ishtp_cl *cl);