lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enic: Make local functions static

Browse Source 
Make functions used locally in a file as static

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David Wang <dwang2@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vasanthy Kolluri
2010-09-30 13:35:45 +00:00
committed by David S. Miller
parent bf746e62af
commit 2fdba38811
7 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/enic/enic_main.c
View File

@@ -1972,7 +1972,7 @@ static int enic_dev_hang_notify(struct enic *enic)
return err; return err;
} }
int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic) static int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic)
{ {
int err; int err;
@@ -2147,14 +2147,14 @@ static const struct net_device_ops enic_netdev_ops = {
#endif #endif
}; };
void enic_dev_deinit(struct enic *enic) static void enic_dev_deinit(struct enic *enic)
{ {
netif_napi_del(&enic->napi); netif_napi_del(&enic->napi);
enic_free_vnic_resources(enic); enic_free_vnic_resources(enic);
enic_clear_intr_mode(enic); enic_clear_intr_mode(enic);
} }
int enic_dev_init(struct enic *enic) static int enic_dev_init(struct enic *enic)
{ {
struct device *dev = enic_get_dev(enic); struct device *dev = enic_get_dev(enic);
struct net_device *netdev = enic->netdev; struct net_device *netdev = enic->netdev;

10
drivers/net/enic/vnic_dev.c
View File

@@ -186,7 +186,7 @@ void __iomem *vnic_dev_get_res(struct vnic_dev *vdev, enum vnic_res_type type,
} }
} }
unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring, static unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring,
unsigned int desc_count, unsigned int desc_size) unsigned int desc_count, unsigned int desc_size)
{ {
/* The base address of the desc rings must be 512 byte aligned. /* The base address of the desc rings must be 512 byte aligned.
@@ -525,14 +525,14 @@ int vnic_dev_open_done(struct vnic_dev *vdev, int *done)
return 0; return 0;
} }
int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg) static int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg)
{ {
u64 a0 = (u32)arg, a1 = 0; u64 a0 = (u32)arg, a1 = 0;
int wait = 1000; int wait = 1000;
return vnic_dev_cmd(vdev, CMD_SOFT_RESET, &a0, &a1, wait); return vnic_dev_cmd(vdev, CMD_SOFT_RESET, &a0, &a1, wait);
} }
int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done) static int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done)
{ {
u64 a0 = 0, a1 = 0; u64 a0 = 0, a1 = 0;
int wait = 1000; int wait = 1000;
@@ -681,7 +681,7 @@ int vnic_dev_set_ig_vlan_rewrite_mode(struct vnic_dev *vdev,
return err; return err;
} }
int vnic_dev_notify_setcmd(struct vnic_dev *vdev, static int vnic_dev_notify_setcmd(struct vnic_dev *vdev,
void *notify_addr, dma_addr_t notify_pa, u16 intr) void *notify_addr, dma_addr_t notify_pa, u16 intr)
{ {
u64 a0, a1; u64 a0, a1;
@@ -720,7 +720,7 @@ int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
return vnic_dev_notify_setcmd(vdev, notify_addr, notify_pa, intr); return vnic_dev_notify_setcmd(vdev, notify_addr, notify_pa, intr);
} }
int vnic_dev_notify_unsetcmd(struct vnic_dev *vdev) static int vnic_dev_notify_unsetcmd(struct vnic_dev *vdev)
{ {
u64 a0, a1; u64 a0, a1;
int wait = 1000; int wait = 1000;

7
drivers/net/enic/vnic_dev.h
View File

@@ -84,8 +84,6 @@ unsigned int vnic_dev_get_res_count(struct vnic_dev *vdev,
enum vnic_res_type type); enum vnic_res_type type);
void __iomem *vnic_dev_get_res(struct vnic_dev *vdev, enum vnic_res_type type, void __iomem *vnic_dev_get_res(struct vnic_dev *vdev, enum vnic_res_type type,
unsigned int index); unsigned int index);
unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring,
unsigned int desc_count, unsigned int desc_size);
void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring); void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring);
int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring, int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring,
unsigned int desc_count, unsigned int desc_size); unsigned int desc_count, unsigned int desc_size);
@@ -106,10 +104,7 @@ int vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr); int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr);
int vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr); int vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr);
int vnic_dev_mac_addr(struct vnic_dev *vdev, u8 *mac_addr); int vnic_dev_mac_addr(struct vnic_dev *vdev, u8 *mac_addr);
int vnic_dev_notify_setcmd(struct vnic_dev *vdev,
void *notify_addr, dma_addr_t notify_pa, u16 intr);
int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr); int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr);
int vnic_dev_notify_unsetcmd(struct vnic_dev *vdev);
int vnic_dev_notify_unset(struct vnic_dev *vdev); int vnic_dev_notify_unset(struct vnic_dev *vdev);
int vnic_dev_link_status(struct vnic_dev *vdev); int vnic_dev_link_status(struct vnic_dev *vdev);
u32 vnic_dev_port_speed(struct vnic_dev *vdev); u32 vnic_dev_port_speed(struct vnic_dev *vdev);
@@ -124,8 +119,6 @@ int vnic_dev_init(struct vnic_dev *vdev, int arg);
int vnic_dev_init_done(struct vnic_dev *vdev, int *done, int *err); int vnic_dev_init_done(struct vnic_dev *vdev, int *done, int *err);
int vnic_dev_init_prov(struct vnic_dev *vdev, u8 *buf, u32 len); int vnic_dev_init_prov(struct vnic_dev *vdev, u8 *buf, u32 len);
int vnic_dev_deinit(struct vnic_dev *vdev); int vnic_dev_deinit(struct vnic_dev *vdev);
int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg);
int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done);
int vnic_dev_hang_reset(struct vnic_dev *vdev, int arg); int vnic_dev_hang_reset(struct vnic_dev *vdev, int arg);
int vnic_dev_hang_reset_done(struct vnic_dev *vdev, int *done); int vnic_dev_hang_reset_done(struct vnic_dev *vdev, int *done);
void vnic_dev_set_intr_mode(struct vnic_dev *vdev, void vnic_dev_set_intr_mode(struct vnic_dev *vdev,

2
drivers/net/enic/vnic_rq.c
View File

@@ -115,7 +115,7 @@ int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,
return 0; return 0;
} }
void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index, static void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index,
unsigned int fetch_index, unsigned int posted_index, unsigned int fetch_index, unsigned int posted_index,
unsigned int error_interrupt_enable, unsigned int error_interrupt_enable,
unsigned int error_interrupt_offset) unsigned int error_interrupt_offset)

4
drivers/net/enic/vnic_rq.h
View File

@@ -202,10 +202,6 @@ static inline int vnic_rq_fill(struct vnic_rq *rq,
void vnic_rq_free(struct vnic_rq *rq); void vnic_rq_free(struct vnic_rq *rq);
int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index, int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,
unsigned int desc_count, unsigned int desc_size); unsigned int desc_count, unsigned int desc_size);
void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index,
unsigned int fetch_index, unsigned int posted_index,
unsigned int error_interrupt_enable,
unsigned int error_interrupt_offset);
void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index, void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,
unsigned int error_interrupt_enable, unsigned int error_interrupt_enable,
unsigned int error_interrupt_offset); unsigned int error_interrupt_offset);

2
drivers/net/enic/vnic_wq.c
View File

@@ -115,7 +115,7 @@ int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,
return 0; return 0;
} }
void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index, static void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
unsigned int fetch_index, unsigned int posted_index, unsigned int fetch_index, unsigned int posted_index,
unsigned int error_interrupt_enable, unsigned int error_interrupt_enable,
unsigned int error_interrupt_offset) unsigned int error_interrupt_offset)

4
drivers/net/enic/vnic_wq.h
View File

@@ -153,10 +153,6 @@ static inline void vnic_wq_service(struct vnic_wq *wq,
void vnic_wq_free(struct vnic_wq *wq); void vnic_wq_free(struct vnic_wq *wq);
int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index, int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,
unsigned int desc_count, unsigned int desc_size); unsigned int desc_count, unsigned int desc_size);
void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
unsigned int fetch_index, unsigned int posted_index,
unsigned int error_interrupt_enable,
unsigned int error_interrupt_offset);
void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index, void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index,
unsigned int error_interrupt_enable, unsigned int error_interrupt_enable,
unsigned int error_interrupt_offset); unsigned int error_interrupt_offset);