aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/vxge/vxge-ethtool.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-11-15 06:12:30 -0500
committerDavid S. Miller <davem@davemloft.net>2010-11-17 13:37:51 -0500
commit5f54cebb13cdb8dcd85036f8bee29f14db18b6e1 (patch)
tree4f40aa2ce399081f47dc86c188bdd33c15972599 /drivers/net/vxge/vxge-ethtool.c
parent8739cfef1ab8bc02e1bf38c02399afe62f3a7800 (diff)
drivers/net/vxge: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Jon Mason <jon.mason@exar.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxge/vxge-ethtool.c')
-rw-r--r--drivers/net/vxge/vxge-ethtool.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/vxge/vxge-ethtool.c b/drivers/net/vxge/vxge-ethtool.c
index 09f721e10517..bc9bd1035706 100644
--- a/drivers/net/vxge/vxge-ethtool.c
+++ b/drivers/net/vxge/vxge-ethtool.c
@@ -80,7 +80,7 @@ static int vxge_ethtool_gset(struct net_device *dev, struct ethtool_cmd *info)
80static void vxge_ethtool_gdrvinfo(struct net_device *dev, 80static void vxge_ethtool_gdrvinfo(struct net_device *dev,
81 struct ethtool_drvinfo *info) 81 struct ethtool_drvinfo *info)
82{ 82{
83 struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); 83 struct vxgedev *vdev = netdev_priv(dev);
84 strlcpy(info->driver, VXGE_DRIVER_NAME, sizeof(VXGE_DRIVER_NAME)); 84 strlcpy(info->driver, VXGE_DRIVER_NAME, sizeof(VXGE_DRIVER_NAME));
85 strlcpy(info->version, DRV_VERSION, sizeof(DRV_VERSION)); 85 strlcpy(info->version, DRV_VERSION, sizeof(DRV_VERSION));
86 strlcpy(info->fw_version, vdev->fw_version, VXGE_HW_FW_STRLEN); 86 strlcpy(info->fw_version, vdev->fw_version, VXGE_HW_FW_STRLEN);
@@ -108,7 +108,7 @@ static void vxge_ethtool_gregs(struct net_device *dev,
108 enum vxge_hw_status status; 108 enum vxge_hw_status status;
109 u64 reg; 109 u64 reg;
110 u64 *reg_space = (u64 *)space; 110 u64 *reg_space = (u64 *)space;
111 struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); 111 struct vxgedev *vdev = netdev_priv(dev);
112 struct __vxge_hw_device *hldev = vdev->devh; 112 struct __vxge_hw_device *hldev = vdev->devh;
113 113
114 regs->len = sizeof(struct vxge_hw_vpath_reg) * vdev->no_of_vpath; 114 regs->len = sizeof(struct vxge_hw_vpath_reg) * vdev->no_of_vpath;
@@ -144,7 +144,7 @@ static void vxge_ethtool_gregs(struct net_device *dev,
144 */ 144 */
145static int vxge_ethtool_idnic(struct net_device *dev, u32 data) 145static int vxge_ethtool_idnic(struct net_device *dev, u32 data)
146{ 146{
147 struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); 147 struct vxgedev *vdev = netdev_priv(dev);
148 struct __vxge_hw_device *hldev = vdev->devh; 148 struct __vxge_hw_device *hldev = vdev->devh;
149 149
150 vxge_hw_device_flick_link_led(hldev, VXGE_FLICKER_ON); 150 vxge_hw_device_flick_link_led(hldev, VXGE_FLICKER_ON);
@@ -166,7 +166,7 @@ static int vxge_ethtool_idnic(struct net_device *dev, u32 data)
166static void vxge_ethtool_getpause_data(struct net_device *dev, 166static void vxge_ethtool_getpause_data(struct net_device *dev,
167 struct ethtool_pauseparam *ep) 167 struct ethtool_pauseparam *ep)
168{ 168{
169 struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); 169 struct vxgedev *vdev = netdev_priv(dev);
170 struct __vxge_hw_device *hldev = vdev->devh; 170 struct __vxge_hw_device *hldev = vdev->devh;
171 171
172 vxge_hw_device_getpause_data(hldev, 0, &ep->tx_pause, &ep->rx_pause); 172 vxge_hw_device_getpause_data(hldev, 0, &ep->tx_pause, &ep->rx_pause);
@@ -185,7 +185,7 @@ static void vxge_ethtool_getpause_data(struct net_device *dev,
185static int vxge_ethtool_setpause_data(struct net_device *dev, 185static int vxge_ethtool_setpause_data(struct net_device *dev,
186 struct ethtool_pauseparam *ep) 186 struct ethtool_pauseparam *ep)
187{ 187{
188 struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); 188 struct vxgedev *vdev = netdev_priv(dev);
189 struct __vxge_hw_device *hldev = vdev->devh; 189 struct __vxge_hw_device *hldev = vdev->devh;
190 190
191 vxge_hw_device_setpause_data(hldev, 0, ep->tx_pause, ep->rx_pause); 191 vxge_hw_device_setpause_data(hldev, 0, ep->tx_pause, ep->rx_pause);
@@ -203,7 +203,7 @@ static void vxge_get_ethtool_stats(struct net_device *dev,
203 enum vxge_hw_status status; 203 enum vxge_hw_status status;
204 enum vxge_hw_status swstatus; 204 enum vxge_hw_status swstatus;
205 struct vxge_vpath *vpath = NULL; 205 struct vxge_vpath *vpath = NULL;
206 struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); 206 struct vxgedev *vdev = netdev_priv(dev);
207 struct __vxge_hw_device *hldev = vdev->devh; 207 struct __vxge_hw_device *hldev = vdev->devh;
208 struct vxge_hw_xmac_stats *xmac_stats; 208 struct vxge_hw_xmac_stats *xmac_stats;
209 struct vxge_hw_device_stats_sw_info *sw_stats; 209 struct vxge_hw_device_stats_sw_info *sw_stats;
@@ -572,7 +572,7 @@ static void vxge_ethtool_get_strings(struct net_device *dev, u32 stringset,
572{ 572{
573 int stat_size = 0; 573 int stat_size = 0;
574 int i, j; 574 int i, j;
575 struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); 575 struct vxgedev *vdev = netdev_priv(dev);
576 switch (stringset) { 576 switch (stringset) {
577 case ETH_SS_STATS: 577 case ETH_SS_STATS:
578 vxge_add_string("VPATH STATISTICS%s\t\t\t", 578 vxge_add_string("VPATH STATISTICS%s\t\t\t",
@@ -1059,21 +1059,21 @@ static void vxge_ethtool_get_strings(struct net_device *dev, u32 stringset,
1059 1059
1060static int vxge_ethtool_get_regs_len(struct net_device *dev) 1060static int vxge_ethtool_get_regs_len(struct net_device *dev)
1061{ 1061{
1062 struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); 1062 struct vxgedev *vdev = netdev_priv(dev);
1063 1063
1064 return sizeof(struct vxge_hw_vpath_reg) * vdev->no_of_vpath; 1064 return sizeof(struct vxge_hw_vpath_reg) * vdev->no_of_vpath;
1065} 1065}
1066 1066
1067static u32 vxge_get_rx_csum(struct net_device *dev) 1067static u32 vxge_get_rx_csum(struct net_device *dev)
1068{ 1068{
1069 struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); 1069 struct vxgedev *vdev = netdev_priv(dev);
1070 1070
1071 return vdev->rx_csum; 1071 return vdev->rx_csum;
1072} 1072}
1073 1073
1074static int vxge_set_rx_csum(struct net_device *dev, u32 data) 1074static int vxge_set_rx_csum(struct net_device *dev, u32 data)
1075{ 1075{
1076 struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); 1076 struct vxgedev *vdev = netdev_priv(dev);
1077 1077
1078 if (data) 1078 if (data)
1079 vdev->rx_csum = 1; 1079 vdev->rx_csum = 1;
@@ -1095,7 +1095,7 @@ static int vxge_ethtool_op_set_tso(struct net_device *dev, u32 data)
1095 1095
1096static int vxge_ethtool_get_sset_count(struct net_device *dev, int sset) 1096static int vxge_ethtool_get_sset_count(struct net_device *dev, int sset)
1097{ 1097{
1098 struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); 1098 struct vxgedev *vdev = netdev_priv(dev);
1099 1099
1100 switch (sset) { 1100 switch (sset) {
1101 case ETH_SS_STATS: 1101 case ETH_SS_STATS:
@@ -1114,7 +1114,7 @@ static int vxge_ethtool_get_sset_count(struct net_device *dev, int sset)
1114 1114
1115static int vxge_set_flags(struct net_device *dev, u32 data) 1115static int vxge_set_flags(struct net_device *dev, u32 data)
1116{ 1116{
1117 struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); 1117 struct vxgedev *vdev = netdev_priv(dev);
1118 enum vxge_hw_status status; 1118 enum vxge_hw_status status;
1119 1119
1120 if (data & ~ETH_FLAG_RXHASH) 1120 if (data & ~ETH_FLAG_RXHASH)
@@ -1148,7 +1148,7 @@ static int vxge_set_flags(struct net_device *dev, u32 data)
1148 1148
1149static int vxge_fw_flash(struct net_device *dev, struct ethtool_flash *parms) 1149static int vxge_fw_flash(struct net_device *dev, struct ethtool_flash *parms)
1150{ 1150{
1151 struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); 1151 struct vxgedev *vdev = netdev_priv(dev);
1152 1152
1153 if (vdev->max_vpath_supported != VXGE_HW_MAX_VIRTUAL_PATHS) { 1153 if (vdev->max_vpath_supported != VXGE_HW_MAX_VIRTUAL_PATHS) {
1154 printk(KERN_INFO "Single Function Mode is required to flash the" 1154 printk(KERN_INFO "Single Function Mode is required to flash the"