Commit 528f7272 authored by Jon Mason's avatar Jon Mason Committed by David S. Miller

vxge: code cleanup and reorganization

Move function locations to remove the need for internal declarations and
other misc clean-ups.
Signed-off-by: default avatarJon Mason <jon.mason@exar.com>
Signed-off-by: default avatarArpit Patel <arpit.patel@exar.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent deef4b52
This diff is collapsed.
...@@ -700,7 +700,7 @@ struct __vxge_hw_virtualpath { ...@@ -700,7 +700,7 @@ struct __vxge_hw_virtualpath {
* *
* This structure is used to store the callback information. * This structure is used to store the callback information.
*/ */
struct __vxge_hw_vpath_handle{ struct __vxge_hw_vpath_handle {
struct list_head item; struct list_head item;
struct __vxge_hw_virtualpath *vpath; struct __vxge_hw_virtualpath *vpath;
}; };
...@@ -815,8 +815,8 @@ struct vxge_hw_device_hw_info { ...@@ -815,8 +815,8 @@ struct vxge_hw_device_hw_info {
u8 serial_number[VXGE_HW_INFO_LEN]; u8 serial_number[VXGE_HW_INFO_LEN];
u8 part_number[VXGE_HW_INFO_LEN]; u8 part_number[VXGE_HW_INFO_LEN];
u8 product_desc[VXGE_HW_INFO_LEN]; u8 product_desc[VXGE_HW_INFO_LEN];
u8 (mac_addrs)[VXGE_HW_MAX_VIRTUAL_PATHS][ETH_ALEN]; u8 mac_addrs[VXGE_HW_MAX_VIRTUAL_PATHS][ETH_ALEN];
u8 (mac_addr_masks)[VXGE_HW_MAX_VIRTUAL_PATHS][ETH_ALEN]; u8 mac_addr_masks[VXGE_HW_MAX_VIRTUAL_PATHS][ETH_ALEN];
}; };
/** /**
...@@ -862,16 +862,6 @@ struct vxge_hw_device_attr { ...@@ -862,16 +862,6 @@ struct vxge_hw_device_attr {
VXGE_HW_STATS_OP_READ, \ VXGE_HW_STATS_OP_READ, \
loc, \ loc, \
offset, \ offset, \
&val64); \
\
if (status != VXGE_HW_OK) \
return status; \
}
#define VXGE_HW_VPATH_STATS_PIO_READ(offset) { \
status = __vxge_hw_vpath_stats_access(vpath, \
VXGE_HW_STATS_OP_READ, \
offset, \
&val64); \ &val64); \
if (status != VXGE_HW_OK) \ if (status != VXGE_HW_OK) \
return status; \ return status; \
...@@ -1927,6 +1917,15 @@ static inline void *vxge_os_dma_malloc(struct pci_dev *pdev, ...@@ -1927,6 +1917,15 @@ static inline void *vxge_os_dma_malloc(struct pci_dev *pdev,
return vaddr; return vaddr;
} }
static inline void vxge_os_dma_free(struct pci_dev *pdev, const void *vaddr,
struct pci_dev **p_dma_acch)
{
unsigned long misaligned = *(unsigned long *)p_dma_acch;
u8 *tmp = (u8 *)vaddr;
tmp -= misaligned;
kfree((void *)tmp);
}
/* /*
* __vxge_hw_mempool_item_priv - will return pointer on per item private space * __vxge_hw_mempool_item_priv - will return pointer on per item private space
*/ */
...@@ -1996,7 +1995,6 @@ enum vxge_hw_status vxge_hw_vpath_mtu_set( ...@@ -1996,7 +1995,6 @@ enum vxge_hw_status vxge_hw_vpath_mtu_set(
void void
vxge_hw_vpath_rx_doorbell_init(struct __vxge_hw_vpath_handle *vp); vxge_hw_vpath_rx_doorbell_init(struct __vxge_hw_vpath_handle *vp);
#ifndef readq #ifndef readq
static inline u64 readq(void __iomem *addr) static inline u64 readq(void __iomem *addr)
{ {
......
This diff is collapsed.
...@@ -305,8 +305,8 @@ struct vxge_vpath { ...@@ -305,8 +305,8 @@ struct vxge_vpath {
int is_configured; int is_configured;
int is_open; int is_open;
struct vxgedev *vdev; struct vxgedev *vdev;
u8 (macaddr)[ETH_ALEN]; u8 macaddr[ETH_ALEN];
u8 (macmask)[ETH_ALEN]; u8 macmask[ETH_ALEN];
#define VXGE_MAX_LEARN_MAC_ADDR_CNT 2048 #define VXGE_MAX_LEARN_MAC_ADDR_CNT 2048
/* mac addresses currently programmed into NIC */ /* mac addresses currently programmed into NIC */
...@@ -420,10 +420,8 @@ struct vxge_tx_priv { ...@@ -420,10 +420,8 @@ struct vxge_tx_priv {
mod_timer(&timer, (jiffies + exp)); \ mod_timer(&timer, (jiffies + exp)); \
} while (0); } while (0);
extern void vxge_initialize_ethtool_ops(struct net_device *ndev); void vxge_initialize_ethtool_ops(struct net_device *ndev);
enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev); enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev);
int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override); int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override);
/** /**
......
This diff is collapsed.
...@@ -2081,10 +2081,6 @@ struct __vxge_hw_ring_rxd_priv { ...@@ -2081,10 +2081,6 @@ struct __vxge_hw_ring_rxd_priv {
#endif #endif
}; };
/* ========================= FIFO PRIVATE API ============================= */
struct vxge_hw_fifo_attr;
struct vxge_hw_mempool_cbs { struct vxge_hw_mempool_cbs {
void (*item_func_alloc)( void (*item_func_alloc)(
struct vxge_hw_mempool *mempoolh, struct vxge_hw_mempool *mempoolh,
...@@ -2158,27 +2154,27 @@ enum vxge_hw_vpath_mac_addr_add_mode { ...@@ -2158,27 +2154,27 @@ enum vxge_hw_vpath_mac_addr_add_mode {
enum vxge_hw_status enum vxge_hw_status
vxge_hw_vpath_mac_addr_add( vxge_hw_vpath_mac_addr_add(
struct __vxge_hw_vpath_handle *vpath_handle, struct __vxge_hw_vpath_handle *vpath_handle,
u8 (macaddr)[ETH_ALEN], u8 *macaddr,
u8 (macaddr_mask)[ETH_ALEN], u8 *macaddr_mask,
enum vxge_hw_vpath_mac_addr_add_mode duplicate_mode); enum vxge_hw_vpath_mac_addr_add_mode duplicate_mode);
enum vxge_hw_status enum vxge_hw_status
vxge_hw_vpath_mac_addr_get( vxge_hw_vpath_mac_addr_get(
struct __vxge_hw_vpath_handle *vpath_handle, struct __vxge_hw_vpath_handle *vpath_handle,
u8 (macaddr)[ETH_ALEN], u8 *macaddr,
u8 (macaddr_mask)[ETH_ALEN]); u8 *macaddr_mask);
enum vxge_hw_status enum vxge_hw_status
vxge_hw_vpath_mac_addr_get_next( vxge_hw_vpath_mac_addr_get_next(
struct __vxge_hw_vpath_handle *vpath_handle, struct __vxge_hw_vpath_handle *vpath_handle,
u8 (macaddr)[ETH_ALEN], u8 *macaddr,
u8 (macaddr_mask)[ETH_ALEN]); u8 *macaddr_mask);
enum vxge_hw_status enum vxge_hw_status
vxge_hw_vpath_mac_addr_delete( vxge_hw_vpath_mac_addr_delete(
struct __vxge_hw_vpath_handle *vpath_handle, struct __vxge_hw_vpath_handle *vpath_handle,
u8 (macaddr)[ETH_ALEN], u8 *macaddr,
u8 (macaddr_mask)[ETH_ALEN]); u8 *macaddr_mask);
enum vxge_hw_status enum vxge_hw_status
vxge_hw_vpath_vid_add( vxge_hw_vpath_vid_add(
...@@ -2285,6 +2281,7 @@ vxge_hw_channel_dtr_free(struct __vxge_hw_channel *channel, void *dtrh); ...@@ -2285,6 +2281,7 @@ vxge_hw_channel_dtr_free(struct __vxge_hw_channel *channel, void *dtrh);
int int
vxge_hw_channel_dtr_count(struct __vxge_hw_channel *channel); vxge_hw_channel_dtr_count(struct __vxge_hw_channel *channel);
void void
vxge_hw_vpath_tti_ci_set(struct __vxge_hw_device *hldev, u32 vp_id); vxge_hw_vpath_tti_ci_set(struct __vxge_hw_device *hldev, u32 vp_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment