: stmmac: make ethtool functions local
Subsystems (3)
PATCH 1/2 : stmmac: make ethtool functions local
Signed-off-by Stephen Hemminger <[email protected]>
drivers/net/stmmac/stmmac_ethtool.c +13 -11
@@ -89,8 +89,8 @@ static const struct stmmac_stats stmmac };#define STMMAC_STATS_LEN ARRAY_SIZE(stmmac_gstrings_stats) -void stmmac_ethtool_getdrvinfo (struct net_device *dev, -struct ethtool_drvinfo *info) +static void stmmac_ethtool_getdrvinfo (struct net_device *dev, +struct ethtool_drvinfo *info) {struct stmmac_priv *priv =netdev_priv (dev);
@@ -104,7 +104,8 @@ void stmmac_ethtool_getdrvinfo(struct ne info->n_stats =STMMAC_STATS_LEN ; } -int stmmac_ethtool_getsettings (struct net_device *dev,struct ethtool_cmd *cmd) +static int stmmac_ethtool_getsettings (struct net_device *dev, +struct ethtool_cmd *cmd) {struct stmmac_priv *priv =netdev_priv (dev);struct phy_device *phy = priv->phydev;
@@ -126,7 +127,8 @@ int stmmac_ethtool_getsettings(struct nereturn rc; } -int stmmac_ethtool_setsettings (struct net_device *dev,struct ethtool_cmd *cmd) +static int stmmac_ethtool_setsettings (struct net_device *dev, +struct ethtool_cmd *cmd) {struct stmmac_priv *priv =netdev_priv (dev);struct phy_device *phy = priv->phydev;
@@ -139,32 +141,32 @@ int stmmac_ethtool_setsettings(struct nereturn rc; } -u32 stmmac_ethtool_getmsglevel (struct net_device *dev) +static u32 stmmac_ethtool_getmsglevel (struct net_device *dev) {struct stmmac_priv *priv =netdev_priv (dev);return priv->msg_enable; } -void stmmac_ethtool_setmsglevel (struct net_device *dev,u32 level) +static void stmmac_ethtool_setmsglevel (struct net_device *dev,u32 level) {struct stmmac_priv *priv =netdev_priv (dev); priv->msg_enable = level; } -int stmmac_check_if_running (struct net_device *dev) +static int stmmac_check_if_running (struct net_device *dev) {if (!netif_running (dev))return -EBUSY ;return 0 ; } -int stmmac_ethtool_get_regs_len (struct net_device *dev) +static int stmmac_ethtool_get_regs_len (struct net_device *dev) {return REG_SPACE_SIZE ; } -void stmmac_ethtool_gregs (struct net_device *dev, +static void stmmac_ethtool_gregs (struct net_device *dev,struct ethtool_regs *regs,void *space) {int i;
@@ -195,7 +197,7 @@ void stmmac_ethtool_gregs(struct net_dev } } -int stmmac_ethtool_set_tx_csum (struct net_device *netdev,u32 data) +static int stmmac_ethtool_set_tx_csum (struct net_device *netdev,u32 data) {if (data) netdev->features |=NETIF_F_HW_CSUM ;
@@ -205,7 +207,7 @@ int stmmac_ethtool_set_tx_csum(struct nereturn 0 ; } -u32 stmmac_ethtool_get_rx_csum (struct net_device *dev) +static u32 stmmac_ethtool_get_rx_csum (struct net_device *dev) {struct stmmac_priv *priv =netdev_priv (dev);
PATCH 2/2 stmmac: make function tables const
These tables only contain function pointers.
Signed-off-by Stephen Hemminger <[email protected]>
--- drivers/net/stmmac/common.h | 6 +++--- drivers/net/stmmac/dwmac100.h | 2 +- drivers/net/stmmac/dwmac1000.h | 2 +- drivers/net/stmmac/dwmac1000_core.c | 2 +- drivers/net/stmmac/dwmac1000_dma.c | 2 +- drivers/net/stmmac/dwmac100_core.c | 2 +- drivers/net/stmmac/dwmac100_dma.c | 2 +- drivers/net/stmmac/enh_desc.c | 2 +- drivers/net/stmmac/norm_desc.c | 2 +- drivers/net/stmmac/stmmac.h | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-)
drivers/net/stmmac/common.h +3 -3
@@ -235,9 +235,9 @@ struct mii_regs { };struct mac_device_info { -struct stmmac_ops *mac; -struct stmmac_desc_ops *desc; -struct stmmac_dma_ops *dma; +const struct stmmac_ops *mac; +const struct stmmac_desc_ops *desc; +const struct stmmac_dma_ops *dma;struct mii_regs mii;/* MII register Addresses */ struct mac_link link; };
drivers/net/stmmac/dwmac1000_core.c +1 -1
@@ -212,7 +212,7 @@ static void dwmac1000_irq_status(void __ } } -struct stmmac_ops dwmac1000_ops = { +static const struct stmmac_ops dwmac1000_ops = { .core_init = dwmac1000_core_init, .rx_coe = dwmac1000_rx_coe_supported, .dump_regs = dwmac1000_dump_regs,
drivers/net/stmmac/dwmac1000_dma.c +1 -1
@@ -138,7 +138,7 @@ static void dwmac1000_dump_dma_regs(void } } -struct stmmac_dma_ops dwmac1000_dma_ops = { +const struct stmmac_dma_ops dwmac1000_dma_ops = { .init = dwmac1000_dma_init, .dump_regs = dwmac1000_dump_dma_regs, .dma_mode = dwmac1000_dma_operation_mode,
drivers/net/stmmac/dwmac100_core.c +1 -1
@@ -168,7 +168,7 @@ static void dwmac100_pmt(void __iomem *ireturn ; } -struct stmmac_ops dwmac100_ops = { +static const struct stmmac_ops dwmac100_ops = { .core_init = dwmac100_core_init, .rx_coe = dwmac100_rx_coe_supported, .dump_regs = dwmac100_dump_mac_regs,
drivers/net/stmmac/dwmac100_dma.c +1 -1
@@ -126,7 +126,7 @@ static void dwmac100_dma_diagnostic_fr(v } } -struct stmmac_dma_ops dwmac100_dma_ops = { +const struct stmmac_dma_ops dwmac100_dma_ops = { .init = dwmac100_dma_init, .dump_regs = dwmac100_dump_dma_regs, .dma_mode = dwmac100_dma_operation_mode,
drivers/net/stmmac/enh_desc.c +1 -1
@@ -318,7 +318,7 @@ static int enh_desc_get_rx_frame_len(strreturn p->des01.erx.frame_length; } -struct stmmac_desc_ops enh_desc_ops = { +const struct stmmac_desc_ops enh_desc_ops = { .tx_status = enh_desc_get_tx_status, .rx_status = enh_desc_get_rx_status, .get_tx_len = enh_desc_get_tx_len,
drivers/net/stmmac/norm_desc.c +1 -1
@@ -202,7 +202,7 @@ static int ndesc_get_rx_frame_len(structreturn p->des01.rx.frame_length; } -struct stmmac_desc_ops ndesc_ops = { +const struct stmmac_desc_ops ndesc_ops = { .tx_status = ndesc_get_tx_status, .rx_status = ndesc_get_rx_status, .get_tx_len = ndesc_get_tx_len,
drivers/net/stmmac/dwmac100.h +1 -1
@@ -118,4 +118,4 @@ enum ttc_control {#define DMA_MISSED_FRAME_OVE_M 0x00010000/* Missed Frame Overflow */ #define DMA_MISSED_FRAME_M_CNTR 0x0000ffff/* Missed Frame Couinter */ -extern struct stmmac_dma_ops dwmac100_dma_ops; +extern const struct stmmac_dma_ops dwmac100_dma_ops;
drivers/net/stmmac/dwmac1000.h +1 -1
@@ -205,4 +205,4 @@ enum rtc_control {#define GMAC_MMC_TX_INTR 0x108#define GMAC_MMC_RX_CSUM_OFFLOAD 0x208 -extern struct stmmac_dma_ops dwmac1000_dma_ops; +extern const struct stmmac_dma_ops dwmac1000_dma_ops;
drivers/net/stmmac/stmmac.h +2 -2
@@ -121,5 +121,5 @@ static inline int stmmac_claim_resource(extern int stmmac_mdio_unregister (struct net_device *ndev);extern int stmmac_mdio_register (struct net_device *ndev);extern void stmmac_set_ethtool_ops (struct net_device *netdev); -extern struct stmmac_desc_ops enh_desc_ops; -extern struct stmmac_desc_ops ndesc_ops; +extern const struct stmmac_desc_ops enh_desc_ops; +extern const struct stmmac_desc_ops ndesc_ops;
Re: [PATCH net-next 2/2] stmmac: make function tables const
Quoted 3 lines · Stephen Hemminger
These tables only contain function pointers.
Signed-off-by Stephen Hemminger <[email protected]>
Re: [PATCH net-next 2/2] stmmac: make function tables const
In reply to Stephen HemmingerFrom: Stephen Hemminger <[email protected]>
Date: Wed, 13 Oct 2010 17:51:25 -0700
Quoted 3 lines
These tables only contain function pointers.
Signed-off-by Stephen Hemminger <[email protected]>
Applied.
Quoted 2 lines · Stephen Hemminger
Signed-off-by Stephen Hemminger <[email protected]>
From: Stephen Hemminger <[email protected]>
Date: Wed, 13 Oct 2010 17:50:31 -0700
Quoted 2 lines
Signed-off-by Stephen Hemminger <[email protected]>
Applied.