diff mbox series

[net-next] rocker: Remove port_attr_bridge_flags_get assignment

Message ID 20190212213905.26559-1-f.fainelli@gmail.com
State Accepted
Delegated to: David Miller
Headers show
Series [net-next] rocker: Remove port_attr_bridge_flags_get assignment | expand

Commit Message

Florian Fainelli Feb. 12, 2019, 9:39 p.m. UTC
After 610d2b601bba ("rocker: Remove getting PORT_BRIDGE_FLAGS") we no
longer have a port_attr_bridge_flags_get member in the rocker_world_ops
structre, fix that.

Fixes: 610d2b601bba ("rocker: Remove getting PORT_BRIDGE_FLAGS")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/ethernet/rocker/rocker_ofdpa.c | 1 -
 1 file changed, 1 deletion(-)

Comments

David Miller Feb. 12, 2019, 9:54 p.m. UTC | #1
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Tue, 12 Feb 2019 13:39:05 -0800

> After 610d2b601bba ("rocker: Remove getting PORT_BRIDGE_FLAGS") we no
> longer have a port_attr_bridge_flags_get member in the rocker_world_ops
> structre, fix that.
> 
> Fixes: 610d2b601bba ("rocker: Remove getting PORT_BRIDGE_FLAGS")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Applied, I'm also getting this:

drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c: In function ‘mlxsw_sp_port_attr_get’:
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c:438:19: warning: unused variable ‘mlxsw_sp’ [-Wunused-variable]
  struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
                   ^~~~~~~~

Related?
Florian Fainelli Feb. 12, 2019, 9:56 p.m. UTC | #2
On 2/12/2019 1:54 PM, David Miller wrote:
> From: Florian Fainelli <f.fainelli@gmail.com>
> Date: Tue, 12 Feb 2019 13:39:05 -0800
> 
>> After 610d2b601bba ("rocker: Remove getting PORT_BRIDGE_FLAGS") we no
>> longer have a port_attr_bridge_flags_get member in the rocker_world_ops
>> structre, fix that.
>>
>> Fixes: 610d2b601bba ("rocker: Remove getting PORT_BRIDGE_FLAGS")
>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> 
> Applied, I'm also getting this:
> 
> drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c: In function ‘mlxsw_sp_port_attr_get’:
> drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c:438:19: warning: unused variable ‘mlxsw_sp’ [-Wunused-variable]
>   struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
>                    ^~~~~~~~
> 
> Related?

Unfortunately yes, that whole patch series was used as test for my build
scripts, which clearly failed miserably here.. Follow-up patches in the
next hours.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c
index 9c07f6040720..fa296a7c255d 100644
--- a/drivers/net/ethernet/rocker/rocker_ofdpa.c
+++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c
@@ -2813,7 +2813,6 @@  struct rocker_world_ops rocker_ofdpa_ops = {
 	.port_stop = ofdpa_port_stop,
 	.port_attr_stp_state_set = ofdpa_port_attr_stp_state_set,
 	.port_attr_bridge_flags_set = ofdpa_port_attr_bridge_flags_set,
-	.port_attr_bridge_flags_get = ofdpa_port_attr_bridge_flags_get,
 	.port_attr_bridge_flags_support_get = ofdpa_port_attr_bridge_flags_support_get,
 	.port_attr_bridge_ageing_time_set = ofdpa_port_attr_bridge_ageing_time_set,
 	.port_obj_vlan_add = ofdpa_port_obj_vlan_add,