enic: Make local functions static · tjh.dev/kernel@2fdba38

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

enic: Make local functions static

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>

authored by

Vasanthy Kolluri and committed by

David S. Miller 15 years ago 2fdba388 bf746e62

+10 -25

7 changed files

expand all

drivers

net

enic

enic_main.c

vnic_dev.c

vnic_dev.h

vnic_rq.c

vnic_rq.h

vnic_wq.c

vnic_wq.h

+3 -3

drivers/net/enic/enic_main.c

··· 1972 1972 return err; 1973 1973 } 1974 1974 1975 - int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic) 1975 + static int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic) 1976 1976 { 1977 1977 int err; 1978 1978 ··· 2147 2147 #endif 2148 2148 }; 2149 2149 2150 - void enic_dev_deinit(struct enic *enic) 2150 + static void enic_dev_deinit(struct enic *enic) 2151 2151 { 2152 2152 netif_napi_del(&enic->napi); 2153 2153 enic_free_vnic_resources(enic); 2154 2154 enic_clear_intr_mode(enic); 2155 2155 } 2156 2156 2157 - int enic_dev_init(struct enic *enic) 2157 + static int enic_dev_init(struct enic *enic) 2158 2158 { 2159 2159 struct device *dev = enic_get_dev(enic); 2160 2160 struct net_device *netdev = enic->netdev;

+5 -5

drivers/net/enic/vnic_dev.c

··· 186 186 } 187 187 } 188 188 189 - unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring, 189 + static unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring, 190 190 unsigned int desc_count, unsigned int desc_size) 191 191 { 192 192 /* The base address of the desc rings must be 512 byte aligned. ··· 525 525 return 0; 526 526 } 527 527 528 - int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg) 528 + static int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg) 529 529 { 530 530 u64 a0 = (u32)arg, a1 = 0; 531 531 int wait = 1000; 532 532 return vnic_dev_cmd(vdev, CMD_SOFT_RESET, &a0, &a1, wait); 533 533 } 534 534 535 - int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done) 535 + static int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done) 536 536 { 537 537 u64 a0 = 0, a1 = 0; 538 538 int wait = 1000; ··· 681 681 return err; 682 682 } 683 683 684 - int vnic_dev_notify_setcmd(struct vnic_dev *vdev, 684 + static int vnic_dev_notify_setcmd(struct vnic_dev *vdev, 685 685 void *notify_addr, dma_addr_t notify_pa, u16 intr) 686 686 { 687 687 u64 a0, a1; ··· 720 720 return vnic_dev_notify_setcmd(vdev, notify_addr, notify_pa, intr); 721 721 } 722 722 723 - int vnic_dev_notify_unsetcmd(struct vnic_dev *vdev) 723 + static int vnic_dev_notify_unsetcmd(struct vnic_dev *vdev) 724 724 { 725 725 u64 a0, a1; 726 726 int wait = 1000;

-7

drivers/net/enic/vnic_dev.h

··· 84 84 enum vnic_res_type type); 85 85 void __iomem *vnic_dev_get_res(struct vnic_dev *vdev, enum vnic_res_type type, 86 86 unsigned int index); 87 - unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring, 88 - unsigned int desc_count, unsigned int desc_size); 89 87 void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring); 90 88 int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring, 91 89 unsigned int desc_count, unsigned int desc_size); ··· 104 106 int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr); 105 107 int vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr); 106 108 int vnic_dev_mac_addr(struct vnic_dev *vdev, u8 *mac_addr); 107 - int vnic_dev_notify_setcmd(struct vnic_dev *vdev, 108 - void *notify_addr, dma_addr_t notify_pa, u16 intr); 109 109 int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr); 110 - int vnic_dev_notify_unsetcmd(struct vnic_dev *vdev); 111 110 int vnic_dev_notify_unset(struct vnic_dev *vdev); 112 111 int vnic_dev_link_status(struct vnic_dev *vdev); 113 112 u32 vnic_dev_port_speed(struct vnic_dev *vdev); ··· 119 124 int vnic_dev_init_done(struct vnic_dev *vdev, int *done, int *err); 120 125 int vnic_dev_init_prov(struct vnic_dev *vdev, u8 *buf, u32 len); 121 126 int vnic_dev_deinit(struct vnic_dev *vdev); 122 - int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg); 123 - int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done); 124 127 int vnic_dev_hang_reset(struct vnic_dev *vdev, int arg); 125 128 int vnic_dev_hang_reset_done(struct vnic_dev *vdev, int *done); 126 129 void vnic_dev_set_intr_mode(struct vnic_dev *vdev,

+1 -1

drivers/net/enic/vnic_rq.c

··· 115 115 return 0; 116 116 } 117 117 118 - void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index, 118 + static void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index, 119 119 unsigned int fetch_index, unsigned int posted_index, 120 120 unsigned int error_interrupt_enable, 121 121 unsigned int error_interrupt_offset)

-4

drivers/net/enic/vnic_rq.h

··· 202 202 void vnic_rq_free(struct vnic_rq *rq); 203 203 int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index, 204 204 unsigned int desc_count, unsigned int desc_size); 205 - void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index, 206 - unsigned int fetch_index, unsigned int posted_index, 207 - unsigned int error_interrupt_enable, 208 - unsigned int error_interrupt_offset); 209 205 void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index, 210 206 unsigned int error_interrupt_enable, 211 207 unsigned int error_interrupt_offset);

+1 -1

drivers/net/enic/vnic_wq.c

··· 115 115 return 0; 116 116 } 117 117 118 - void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index, 118 + static void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index, 119 119 unsigned int fetch_index, unsigned int posted_index, 120 120 unsigned int error_interrupt_enable, 121 121 unsigned int error_interrupt_offset)

-4

drivers/net/enic/vnic_wq.h

··· 153 153 void vnic_wq_free(struct vnic_wq *wq); 154 154 int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index, 155 155 unsigned int desc_count, unsigned int desc_size); 156 - void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index, 157 - unsigned int fetch_index, unsigned int posted_index, 158 - unsigned int error_interrupt_enable, 159 - unsigned int error_interrupt_offset); 160 156 void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index, 161 157 unsigned int error_interrupt_enable, 162 158 unsigned int error_interrupt_offset);