lkml.org 
[lkml]   [2022]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v3 23/47] net: fman: Export/rename some common functions
    Date
    In preparation for moving each of the initialization functions to their
    own file, export some common functions so they can be re-used. This adds
    an fman prefix to set_multi to make it a bit less genericly-named.

    Signed-off-by: Sean Anderson <sean.anderson@seco.com>
    ---

    (no changes since v1)

    drivers/net/ethernet/freescale/fman/mac.c | 12 ++++++------
    drivers/net/ethernet/freescale/fman/mac.h | 3 +++
    2 files changed, 9 insertions(+), 6 deletions(-)

    diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
    index af5e5d98e23e..0ac8df87308a 100644
    --- a/drivers/net/ethernet/freescale/fman/mac.c
    +++ b/drivers/net/ethernet/freescale/fman/mac.c
    @@ -58,8 +58,8 @@ static void mac_exception(void *handle, enum fman_mac_exceptions ex)
    __func__, ex);
    }

    -static int set_fman_mac_params(struct mac_device *mac_dev,
    - struct fman_mac_params *params)
    +int set_fman_mac_params(struct mac_device *mac_dev,
    + struct fman_mac_params *params)
    {
    struct mac_priv_s *priv = mac_dev->priv;

    @@ -82,7 +82,7 @@ static int set_fman_mac_params(struct mac_device *mac_dev,
    return 0;
    }

    -static int set_multi(struct net_device *net_dev, struct mac_device *mac_dev)
    +int fman_set_multi(struct net_device *net_dev, struct mac_device *mac_dev)
    {
    struct mac_priv_s *priv;
    struct mac_address *old_addr, *tmp;
    @@ -275,7 +275,7 @@ static int tgec_initialization(struct mac_device *mac_dev,
    mac_dev->set_exception = tgec_set_exception;
    mac_dev->set_allmulti = tgec_set_allmulti;
    mac_dev->set_tstamp = tgec_set_tstamp;
    - mac_dev->set_multi = set_multi;
    + mac_dev->set_multi = fman_set_multi;
    mac_dev->adjust_link = adjust_link_void;
    mac_dev->enable = tgec_enable;
    mac_dev->disable = tgec_disable;
    @@ -335,7 +335,7 @@ static int dtsec_initialization(struct mac_device *mac_dev,
    mac_dev->set_exception = dtsec_set_exception;
    mac_dev->set_allmulti = dtsec_set_allmulti;
    mac_dev->set_tstamp = dtsec_set_tstamp;
    - mac_dev->set_multi = set_multi;
    + mac_dev->set_multi = fman_set_multi;
    mac_dev->adjust_link = adjust_link_dtsec;
    mac_dev->enable = dtsec_enable;
    mac_dev->disable = dtsec_disable;
    @@ -402,7 +402,7 @@ static int memac_initialization(struct mac_device *mac_dev,
    mac_dev->set_exception = memac_set_exception;
    mac_dev->set_allmulti = memac_set_allmulti;
    mac_dev->set_tstamp = memac_set_tstamp;
    - mac_dev->set_multi = set_multi;
    + mac_dev->set_multi = fman_set_multi;
    mac_dev->adjust_link = adjust_link_memac;
    mac_dev->enable = memac_enable;
    mac_dev->disable = memac_disable;
    diff --git a/drivers/net/ethernet/freescale/fman/mac.h b/drivers/net/ethernet/freescale/fman/mac.h
    index 05dbb8b5a704..da410a7d00c9 100644
    --- a/drivers/net/ethernet/freescale/fman/mac.h
    +++ b/drivers/net/ethernet/freescale/fman/mac.h
    @@ -71,5 +71,8 @@ int fman_set_mac_active_pause(struct mac_device *mac_dev, bool rx, bool tx);

    void fman_get_pause_cfg(struct mac_device *mac_dev, bool *rx_pause,
    bool *tx_pause);
    +int set_fman_mac_params(struct mac_device *mac_dev,
    + struct fman_mac_params *params);
    +int fman_set_multi(struct net_device *net_dev, struct mac_device *mac_dev);

    #endif /* __MAC_H */
    --
    2.35.1.1320.gc452695387.dirty
    \
     
     \ /
      Last update: 2022-07-16 00:05    [W:2.126 / U:0.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site