net: qualcomm: rmnet: Remove the rmnet_map_results enum

Only the success and consumed entries were actually in use.
Use standard error codes instead.

Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
index 08e4afc0ab39b42ff8585a466daf64d9f25fb703..1e1ea100f28c22e821f490ed766eaf0e5c2e672f 100644 (file)
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
@@ -142,11 +142,11 @@ static int rmnet_map_egress_handler(struct sk_buff *skb,
 
        skb->protocol = htons(ETH_P_MAP);
 
-       return RMNET_MAP_SUCCESS;
+       return 0;
 
 fail:
        kfree_skb(skb);
-       return RMNET_MAP_CONSUMED;
+       return -ENOMEM;
 }
 
 static void
@@ -213,17 +213,8 @@ void rmnet_egress_handler(struct sk_buff *skb)
        }
 
        if (port->egress_data_format & RMNET_EGRESS_FORMAT_MAP) {
-               switch (rmnet_map_egress_handler(skb, port, mux_id, orig_dev)) {
-               case RMNET_MAP_CONSUMED:
+               if (rmnet_map_egress_handler(skb, port, mux_id, orig_dev))
                        return;
-
-               case RMNET_MAP_SUCCESS:
-                       break;
-
-               default:
-                       kfree_skb(skb);
-                       return;
-               }
        }
 
        rmnet_vnd_tx_fixup(skb, orig_dev);

diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h
index 3af3fe7b54570e76b37ed8b43a19cbf2d674fdb6..4df359de28c589a79ed72781c29360474452828d 100644 (file)
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h
@@ -30,15 +30,6 @@ struct rmnet_map_control_command {
        };
 }  __aligned(1);
 
-enum rmnet_map_results {
-       RMNET_MAP_SUCCESS,
-       RMNET_MAP_CONSUMED,
-       RMNET_MAP_GENERAL_FAILURE,
-       RMNET_MAP_NOT_ENABLED,
-       RMNET_MAP_FAILED_AGGREGATION,
-       RMNET_MAP_FAILED_MUX
-};
-
 enum rmnet_map_commands {
        RMNET_MAP_COMMAND_NONE,
        RMNET_MAP_COMMAND_FLOW_DISABLE,