Commit 4640a1f0 authored by Kory Maincent's avatar Kory Maincent Committed by Paolo Abeni
Browse files

net: pse-pd: Remove is_enabled callback from drivers 



The is_enabled callback is now redundant as the admin_state can be obtained
directly from the driver and provides the same information.

To simplify functionality, the core will handle this internally, making
the is_enabled callback unnecessary at the driver level. Remove the
callback from all drivers.

Acked-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: default avatarKory Maincent <kory.maincent@bootlin.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 3e9dbfec

drivers/net/pse-pd/pd692x0.c

+0 −26
Original line number Diff line number Diff line
@@ -431,31 +431,6 @@ static int pd692x0_pi_disable(struct pse_controller_dev *pcdev, int id) 
	return 0;

}



static int pd692x0_pi_is_enabled(struct pse_controller_dev *pcdev, int id)

{

	struct pd692x0_priv *priv = to_pd692x0_priv(pcdev);

	struct pd692x0_msg msg, buf = {0};

	int ret;



	ret = pd692x0_fw_unavailable(priv);

	if (ret)

		return ret;



	msg = pd692x0_msg_template_list[PD692X0_MSG_GET_PORT_STATUS];

	msg.sub[2] = id;

	ret = pd692x0_sendrecv_msg(priv, &msg, &buf);

	if (ret < 0)

		return ret;



	if (buf.sub[1]) {

		priv->admin_state[id] = ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED;

		return 1;

	} else {

		priv->admin_state[id] = ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED;

		return 0;

	}

}



struct pd692x0_pse_ext_state_mapping {

	u32 status_code;

	enum ethtool_c33_pse_ext_state pse_ext_state;
@@ -1105,7 +1080,6 @@ static const struct pse_controller_ops pd692x0_ops = { 
	.pi_get_actual_pw = pd692x0_pi_get_actual_pw,

	.pi_enable = pd692x0_pi_enable,

	.pi_disable = pd692x0_pi_disable,

	.pi_is_enabled = pd692x0_pi_is_enabled,

	.pi_get_voltage = pd692x0_pi_get_voltage,

	.pi_get_pw_limit = pd692x0_pi_get_pw_limit,

	.pi_set_pw_limit = pd692x0_pi_set_pw_limit,

drivers/net/pse-pd/pse_core.c

+11 −2
Original line number Diff line number Diff line
@@ -210,16 +210,25 @@ static int of_load_pse_pis(struct pse_controller_dev *pcdev) 
static int pse_pi_is_enabled(struct regulator_dev *rdev)

{

	struct pse_controller_dev *pcdev = rdev_get_drvdata(rdev);

	struct pse_admin_state admin_state = {0};

	const struct pse_controller_ops *ops;

	int id, ret;



	ops = pcdev->ops;

	if (!ops->pi_is_enabled)

	if (!ops->pi_get_admin_state)

		return -EOPNOTSUPP;



	id = rdev_get_id(rdev);

	mutex_lock(&pcdev->lock);

	ret = ops->pi_is_enabled(pcdev, id);

	ret = ops->pi_get_admin_state(pcdev, id, &admin_state);

	if (ret)

		goto out;



	if (admin_state.podl_admin_state == ETHTOOL_PODL_PSE_ADMIN_STATE_ENABLED ||

	    admin_state.c33_admin_state == ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED)

		ret = 1;



out:

	mutex_unlock(&pcdev->lock);



	return ret;

drivers/net/pse-pd/pse_regulator.c

+0 −9
Original line number Diff line number Diff line
@@ -51,14 +51,6 @@ pse_reg_pi_disable(struct pse_controller_dev *pcdev, int id) 
	return 0;

}



static int

pse_reg_pi_is_enabled(struct pse_controller_dev *pcdev, int id)

{

	struct pse_reg_priv *priv = to_pse_reg(pcdev);



	return regulator_is_enabled(priv->ps);

}



static int

pse_reg_pi_get_admin_state(struct pse_controller_dev *pcdev, int id,

			   struct pse_admin_state *admin_state)
@@ -95,7 +87,6 @@ static const struct pse_controller_ops pse_reg_ops = { 
	.pi_get_admin_state = pse_reg_pi_get_admin_state,

	.pi_get_pw_status = pse_reg_pi_get_pw_status,

	.pi_enable = pse_reg_pi_enable,

	.pi_is_enabled = pse_reg_pi_is_enabled,

	.pi_disable = pse_reg_pi_disable,

};

drivers/net/pse-pd/tps23881.c

+0 −28
Original line number Diff line number Diff line
@@ -174,33 +174,6 @@ static int tps23881_pi_disable(struct pse_controller_dev *pcdev, int id) 
	return i2c_smbus_write_word_data(client, TPS23881_REG_DET_CLA_EN, val);

}



static int tps23881_pi_is_enabled(struct pse_controller_dev *pcdev, int id)

{

	struct tps23881_priv *priv = to_tps23881_priv(pcdev);

	struct i2c_client *client = priv->client;

	bool enabled;

	u8 chan;

	u16 val;

	int ret;



	ret = i2c_smbus_read_word_data(client, TPS23881_REG_PW_STATUS);

	if (ret < 0)

		return ret;



	chan = priv->port[id].chan[0];

	val = tps23881_calc_val(ret, chan, 0, BIT(chan % 4));

	enabled = !!(val);



	if (priv->port[id].is_4p) {

		chan = priv->port[id].chan[1];

		val = tps23881_calc_val(ret, chan, 0, BIT(chan % 4));

		enabled &= !!(val);

	}



	/* Return enabled status only if both channel are on this state */

	return enabled;

}



static int

tps23881_pi_get_admin_state(struct pse_controller_dev *pcdev, int id,

			    struct pse_admin_state *admin_state)
@@ -690,7 +663,6 @@ static const struct pse_controller_ops tps23881_ops = { 
	.setup_pi_matrix = tps23881_setup_pi_matrix,

	.pi_enable = tps23881_pi_enable,

	.pi_disable = tps23881_pi_disable,

	.pi_is_enabled = tps23881_pi_is_enabled,

	.pi_get_admin_state = tps23881_pi_get_admin_state,

	.pi_get_pw_status = tps23881_pi_get_pw_status,

};

include/linux/pse-pd/pse.h

+0 −3
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@ struct ethtool_pse_control_status { 
 * @pi_get_ext_state: Get the extended state of the PSE PI.

 * @pi_get_pw_class: Get the power class of the PSE PI.

 * @pi_get_actual_pw: Get actual power of the PSE PI in mW.

 * @pi_is_enabled: Return 1 if the PSE PI is enabled, 0 if not.

 *		   May also return negative errno.

 * @pi_enable: Configure the PSE PI as enabled.

 * @pi_disable: Configure the PSE PI as disabled.

 * @pi_get_voltage: Return voltage similarly to get_voltage regulator
@@ -145,7 +143,6 @@ struct pse_controller_ops { 
				struct pse_ext_state_info *ext_state_info);

	int (*pi_get_pw_class)(struct pse_controller_dev *pcdev, int id);

	int (*pi_get_actual_pw)(struct pse_controller_dev *pcdev, int id);

	int (*pi_is_enabled)(struct pse_controller_dev *pcdev, int id);

	int (*pi_enable)(struct pse_controller_dev *pcdev, int id);

	int (*pi_disable)(struct pse_controller_dev *pcdev, int id);

	int (*pi_get_voltage)(struct pse_controller_dev *pcdev, int id);