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

Commit b12bbdc5 authored by Hyungwoo Yang's avatar Hyungwoo Yang Committed by Jiri Kosina
Browse files

HID: intel-ish-hid: fix wrong driver_data usage 



Currently, in suspend() and resume(), ishtp client drivers are using
driver_data to get "struct ishtp_cl_device" object which is set by
bus driver. It's wrong since the driver_data should not be owned bus.
driver_data should be owned by the corresponding ishtp client driver.
Due to this, some ishtp client driver like cros_ec_ishtp which uses
its driver_data to transfer its data to its child doesn't work correctly.

So this patch removes setting driver_data in bus drier and instead of
using driver_data to get "struct ishtp_cl_device", since "struct device"
is embedded in "struct ishtp_cl_device", we introduce a helper function
that returns "struct ishtp_cl_device" from "struct device".

Signed-off-by: default avatarHyungwoo Yang <hyungwoo.yang@intel.com>
Acked-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 0a95fc73

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

+2 −2
Original line number Diff line number Diff line
@@ -899,7 +899,7 @@ static int hid_ishtp_cl_reset(struct ishtp_cl_device *cl_device) 
 */

static int hid_ishtp_cl_suspend(struct device *device)

{

	struct ishtp_cl_device *cl_device = dev_get_drvdata(device);

	struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device);

	struct ishtp_cl *hid_ishtp_cl = ishtp_get_drvdata(cl_device);

	struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl);
@@ -920,7 +920,7 @@ static int hid_ishtp_cl_suspend(struct device *device) 
 */

static int hid_ishtp_cl_resume(struct device *device)

{

	struct ishtp_cl_device *cl_device = dev_get_drvdata(device);

	struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device);

	struct ishtp_cl *hid_ishtp_cl = ishtp_get_drvdata(cl_device);

	struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl);

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

+14 −1
Original line number Diff line number Diff line
@@ -479,7 +479,6 @@ static struct ishtp_cl_device *ishtp_bus_add_device(struct ishtp_device *dev, 
	}



	ishtp_device_ready = true;

	dev_set_drvdata(&device->dev, device);



	return device;

}
@@ -647,6 +646,20 @@ void *ishtp_get_drvdata(struct ishtp_cl_device *cl_device) 
}

EXPORT_SYMBOL(ishtp_get_drvdata);



/**

 * ishtp_dev_to_cl_device() - get ishtp_cl_device instance from device instance

 * @device: device instance

 *

 * Get ish_cl_device instance which embeds device instance in it.

 *

 * Return: pointer to ishtp_cl_device instance

 */

struct ishtp_cl_device *ishtp_dev_to_cl_device(struct device *device)

{

	return to_ishtp_cl_device(device);

}

EXPORT_SYMBOL(ishtp_dev_to_cl_device);



/**

 * ishtp_bus_new_client() - Create a new client

 * @dev:	ISHTP device instance

include/linux/intel-ish-client-if.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ void ishtp_put_device(struct ishtp_cl_device *cl_dev); 
void ishtp_get_device(struct ishtp_cl_device *cl_dev);

void ishtp_set_drvdata(struct ishtp_cl_device *cl_device, void *data);

void *ishtp_get_drvdata(struct ishtp_cl_device *cl_device);

struct ishtp_cl_device *ishtp_dev_to_cl_device(struct device *dev);

int ishtp_register_event_cb(struct ishtp_cl_device *device,

				void (*read_cb)(struct ishtp_cl_device *));

struct	ishtp_fw_client *ishtp_fw_cl_get_client(struct ishtp_device *dev,