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

Commit 9d65615c authored by Subbaraman Narayanamurthy's avatar Subbaraman Narayanamurthy
Browse files

soc: qcom: pmic_glink: rename callback function pointer 



In preparation for subsystem restart (SSR) and protection domain
restart (PDR) where subsystem state transitions would be sent to
PMIC Glink clients via another callback function, change the client
callback function pointer name to msg_cb. This would convey that
this callback is for delivering the messages to a client upon its
registration.

Change-Id: I584d6c5d3898fe54e6928b25502d6382ce6ccbc4
Signed-off-by: default avatarSubbaraman Narayanamurthy <subbaram@codeaurora.org>
parent 17c22334

drivers/power/supply/qti_battery_charger.c

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ static int battery_chg_probe(struct platform_device *pdev) 


	client_data.id = MSG_OWNER_BC;

	client_data.name = "battery_charger";

	client_data.callback = battery_chg_callback;

	client_data.msg_cb = battery_chg_callback;

	client_data.priv = bcdev;



	bcdev->client = pmic_glink_register_client(dev, &client_data);

drivers/soc/qcom/altmode-glink.c

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static int altmode_probe(struct platform_device *pdev) 


	pgclient_data.id = MSG_OWNER_USBC_PAN;

	pgclient_data.name = "altmode";

	pgclient_data.callback = altmode_callback;

	pgclient_data.msg_cb = altmode_callback;

	pgclient_data.priv = amdev;



	amdev->pgclient = pmic_glink_register_client(amdev->dev,

drivers/soc/qcom/pmic_glink.c

+7 −6
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ struct pmic_glink_dev { 
 * @id:		Unique id for client for communication

 * @lock:	lock for sending data

 * @priv:	private data for client

 * @callback:	callback function for client

 * @msg_cb:	callback function for client to receive the messages that

 *		are intended to be delivered to it over PMIC Glink

 */

struct pmic_glink_client {

	struct pmic_glink_dev	*pgdev;
@@ -71,7 +72,7 @@ struct pmic_glink_client { 
	u32			id;

	struct mutex		lock;

	void			*priv;

	int			(*callback)(void *priv, void *data, size_t len);

	int			(*msg_cb)(void *priv, void *data, size_t len);

};



struct pmic_glink_buf {
@@ -177,7 +178,7 @@ struct pmic_glink_client *pmic_glink_register_client(struct device *dev, 
	if (!dev || !dev->parent)

		return ERR_PTR(-ENODEV);



	if (!client_data->id || !client_data->callback || !client_data->name)

	if (!client_data->id || !client_data->msg_cb || !client_data->name)

		return ERR_PTR(-EINVAL);



	pgdev = get_pmic_glink_from_dev(dev->parent);
@@ -204,7 +205,7 @@ struct pmic_glink_client *pmic_glink_register_client(struct device *dev, 


	mutex_init(&client->lock);

	client->id = client_data->id;

	client->callback = client_data->callback;

	client->msg_cb = client_data->msg_cb;

	client->priv = client_data->priv;

	client->pgdev = pgdev;
@@ -263,7 +264,7 @@ static void pmic_glink_rx_callback(struct pmic_glink_dev *pgdev, 
	client = idr_find(&pgdev->client_idr, hdr->owner);

	mutex_unlock(&pgdev->client_lock);



	if (!client || !client->callback) {

	if (!client || !client->msg_cb) {

		pr_err("No client present for %u\n", hdr->owner);

		return;

	}
@@ -276,7 +277,7 @@ static void pmic_glink_rx_callback(struct pmic_glink_dev *pgdev, 
				pbuf->buf);

	}



	client->callback(client->priv, pbuf->buf, pbuf->len);

	client->msg_cb(client->priv, pbuf->buf, pbuf->len);

}



static void pmic_glink_rx_work(struct work_struct *work)

drivers/soc/qcom/qti_battery_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ static int battery_dbg_probe(struct platform_device *pdev) 
	bd->dev = &pdev->dev;

	client_data.id = MSG_OWNER_BD;

	client_data.name = "battery_debug";

	client_data.callback = battery_dbg_callback;

	client_data.msg_cb = battery_dbg_callback;

	client_data.priv = bd;



	bd->client = pmic_glink_register_client(bd->dev, &client_data);

drivers/spmi/spmi-glink-debug.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int spmi_glink_probe(struct platform_device *pdev) 


	client_data.id = MSG_OWNER_REG_DUMP;

	client_data.name = "spmi_register_debug";

	client_data.callback = spmi_glink_callback;

	client_data.msg_cb = spmi_glink_callback;

	client_data.priv = gd;



	gd->client = pmic_glink_register_client(&pdev->dev, &client_data);