lkml.org 
[lkml]   [2022]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RESEND PATCH net-next v4 19/25] net: fman: Specify type of mac_dev for exception_cb
    Date
    Instead of using a void pointer for mac_dev, specify its type
    explicitly.

    Signed-off-by: Sean Anderson <sean.anderson@seco.com>
    Acked-by: Camelia Groza <camelia.groza@nxp.com>
    ---

    (no changes since v2)

    Changes in v2:
    - New

    drivers/net/ethernet/freescale/fman/fman_dtsec.c | 2 +-
    drivers/net/ethernet/freescale/fman/fman_mac.h | 5 +++--
    drivers/net/ethernet/freescale/fman/fman_memac.c | 2 +-
    drivers/net/ethernet/freescale/fman/fman_tgec.c | 2 +-
    drivers/net/ethernet/freescale/fman/mac.c | 5 ++---
    5 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/drivers/net/ethernet/freescale/fman/fman_dtsec.c b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
    index 09ad1117005a..7acd57424034 100644
    --- a/drivers/net/ethernet/freescale/fman/fman_dtsec.c
    +++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
    @@ -301,7 +301,7 @@ struct fman_mac {
    /* Ethernet physical interface */
    phy_interface_t phy_if;
    u16 max_speed;
    - void *dev_id; /* device cookie used by the exception cbs */
    + struct mac_device *dev_id; /* device cookie used by the exception cbs */
    fman_mac_exception_cb *exception_cb;
    fman_mac_exception_cb *event_cb;
    /* Number of individual addresses in registers for this station */
    diff --git a/drivers/net/ethernet/freescale/fman/fman_mac.h b/drivers/net/ethernet/freescale/fman/fman_mac.h
    index 730aae7fed13..65887a3160d7 100644
    --- a/drivers/net/ethernet/freescale/fman/fman_mac.h
    +++ b/drivers/net/ethernet/freescale/fman/fman_mac.h
    @@ -41,6 +41,7 @@
    #include <linux/if_ether.h>

    struct fman_mac;
    +struct mac_device;

    /* Ethernet Address */
    typedef u8 enet_addr_t[ETH_ALEN];
    @@ -158,8 +159,8 @@ struct eth_hash_entry {
    struct list_head node;
    };

    -typedef void (fman_mac_exception_cb)(void *dev_id,
    - enum fman_mac_exceptions exceptions);
    +typedef void (fman_mac_exception_cb)(struct mac_device *dev_id,
    + enum fman_mac_exceptions exceptions);

    /* FMan MAC config input */
    struct fman_mac_params {
    diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c
    index 2f3050df5ab9..19619af99f9c 100644
    --- a/drivers/net/ethernet/freescale/fman/fman_memac.c
    +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c
    @@ -311,7 +311,7 @@ struct fman_mac {
    /* Ethernet physical interface */
    phy_interface_t phy_if;
    u16 max_speed;
    - void *dev_id; /* device cookie used by the exception cbs */
    + struct mac_device *dev_id; /* device cookie used by the exception cbs */
    fman_mac_exception_cb *exception_cb;
    fman_mac_exception_cb *event_cb;
    /* Pointer to driver's global address hash table */
    diff --git a/drivers/net/ethernet/freescale/fman/fman_tgec.c b/drivers/net/ethernet/freescale/fman/fman_tgec.c
    index 2642a4c27292..010c0e0b57d7 100644
    --- a/drivers/net/ethernet/freescale/fman/fman_tgec.c
    +++ b/drivers/net/ethernet/freescale/fman/fman_tgec.c
    @@ -180,7 +180,7 @@ struct fman_mac {
    /* MAC address of device; */
    u64 addr;
    u16 max_speed;
    - void *dev_id; /* device cookie used by the exception cbs */
    + struct mac_device *dev_id; /* device cookie used by the exception cbs */
    fman_mac_exception_cb *exception_cb;
    fman_mac_exception_cb *event_cb;
    /* pointer to driver's global address hash table */
    diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
    index 0f9e3e9e60c6..66a3742a862b 100644
    --- a/drivers/net/ethernet/freescale/fman/mac.c
    +++ b/drivers/net/ethernet/freescale/fman/mac.c
    @@ -41,10 +41,9 @@ struct mac_address {
    struct list_head list;
    };

    -static void mac_exception(void *handle, enum fman_mac_exceptions ex)
    +static void mac_exception(struct mac_device *mac_dev,
    + enum fman_mac_exceptions ex)
    {
    - struct mac_device *mac_dev = handle;
    -
    if (ex == FM_MAC_EX_10G_RX_FIFO_OVFL) {
    /* don't flag RX FIFO after the first */
    mac_dev->set_exception(mac_dev->fman_mac,
    --
    2.35.1.1320.gc452695387.dirty
    \
     
     \ /
      Last update: 2022-08-18 18:21    [W:4.179 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site