[PATCH 0/3] remove do_get_state() callback

[PATCH 0/3] remove do_get_state() callback

[Marc Kleine-Budde]

Hello,

this patch series removes the do_get_state() callback from the driver
interface, as it is not needed to get the state of the interface.

regards,
Marc

[PATCH 1/3] can: ti_hecc: remove priv->can.do_get_state() callback

[Marc Kleine-Budde]

This is a preparation patch to remove the priv->can.do_get_state() callback
completely.

This patch removes the priv->can.do_get_state() callback, as just returns
priv->can.state. The only user can_fill_info() already has direct access to
priv->can.state.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/ti_hecc.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index beb5ef8..60d95b4 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -286,15 +286,6 @@ static inline u32 hecc_get_bit(struct ti_hecc_priv *priv, int reg, u32 bit_mask)
 	return (hecc_read(priv, reg) & bit_mask) ? 1 : 0;
 }
 
-static int ti_hecc_get_state(const struct net_device *ndev,
-	enum can_state *state)
-{
-	struct ti_hecc_priv *priv = netdev_priv(ndev);
-
-	*state = priv->can.state;
-	return 0;
-}
-
 static int ti_hecc_set_btc(struct ti_hecc_priv *priv)
 {
 	struct can_bittiming *bit_timing = &priv->can.bittiming;
@@ -940,7 +931,6 @@ static int ti_hecc_probe(struct platform_device *pdev)
 
 	priv->can.bittiming_const = &ti_hecc_bittiming_const;
 	priv->can.do_set_mode = ti_hecc_do_set_mode;
-	priv->can.do_get_state = ti_hecc_get_state;
 	priv->can.do_get_berr_counter = ti_hecc_get_berr_counter;
 	priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
 
-- 
1.8.4.rc3

[PATCH 2/3] can: dev: remove do_get_state() form can_fill_info()

[Marc Kleine-Budde]

As there is no driver that implements do_get_state(), remove the call from
can_fill_info().

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/dev.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index f9cba41..54eca2f 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -724,8 +724,6 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
 	struct can_berr_counter bec;
 	enum can_state state = priv->state;
 
-	if (priv->do_get_state)
-		priv->do_get_state(dev, &state);
 	if (nla_put_u32(skb, IFLA_CAN_STATE, state) ||
 	    nla_put(skb, IFLA_CAN_CTRLMODE, sizeof(cm), &cm) ||
 	    nla_put_u32(skb, IFLA_CAN_RESTART_MS, priv->restart_ms) ||
-- 
1.8.4.rc3

[PATCH 3/3] can: dev: remove do_get_state() callback from struct can_priv

[Marc Kleine-Budde]

As there are no users of the do_get_state() callback it is removed from the
struct can_priv.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 include/linux/can/dev.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index fb0ab65..b0a429e 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -46,8 +46,6 @@ struct can_priv {
 
 	int (*do_set_bittiming)(struct net_device *dev);
 	int (*do_set_mode)(struct net_device *dev, enum can_mode mode);
-	int (*do_get_state)(const struct net_device *dev,
-			    enum can_state *state);
 	int (*do_get_berr_counter)(const struct net_device *dev,
 				   struct can_berr_counter *bec);
 
-- 
1.8.4.rc3

Re: [PATCH 0/3] remove do_get_state() callback

[Wolfgang Grandegger]

On 10/07/2013 04:46 PM, Marc Kleine-Budde wrote:
> Hello,
> 
> this patch series removes the do_get_state() callback from the driver
> interface, as it is not needed to get the state of the interface.

I just realized that Max's GS-USB driver would require it because the
device does not send asynchronous error and state change messages. But
thinking more about it, I tend to nack such a solution as it breaks many
user space programs.

Wolfgang.

Re: [PATCH 0/3] remove do_get_state() callback

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 944 bytes --]

On 10/07/2013 09:25 PM, Wolfgang Grandegger wrote:
>> this patch series removes the do_get_state() callback from the driver
>> interface, as it is not needed to get the state of the interface.

Then I'll just take "[PATCH 1/3] can: ti_hecc: remove
priv->can.do_get_state() callback"

> I just realized that Max's GS-USB driver would require it because the
> device does not send asynchronous error and state change messages. But
> thinking more about it, I tend to nack such a solution as it breaks many
> user space programs.

The real need for a synchronous state callback to the driver has come
with the GS-USB device. I'll drop patches 2+3.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]