Skip to content

Commit

Permalink
net: fman: Specify type of mac_dev for exception_cb
Browse files Browse the repository at this point in the history
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sean Anderson authored and David S. Miller committed Sep 5, 2022
1 parent 19c788b commit 5b6acb5
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/freescale/fman/fman_dtsec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
5 changes: 3 additions & 2 deletions drivers/net/ethernet/freescale/fman/fman_mac.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include <linux/if_ether.h>

struct fman_mac;
struct mac_device;

/* Ethernet Address */
typedef u8 enet_addr_t[ETH_ALEN];
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/freescale/fman/fman_memac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
5 changes: 3 additions & 2 deletions drivers/net/ethernet/freescale/fman/fman_tgec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -728,7 +728,8 @@ static int tgec_free(struct fman_mac *tgec)
return 0;
}

static struct fman_mac *tgec_config(struct mac_device *mac_dev, struct fman_mac_params *params)
static struct fman_mac *tgec_config(struct mac_device *mac_dev,
struct fman_mac_params *params)
{
struct fman_mac *tgec;
struct tgec_cfg *cfg;
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/ethernet/freescale/fman/mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 5b6acb5

Please sign in to comment.