Skip to content

Commit abe8b90

Browse files
NET:ETH:ALTERA: SM Ethernet 10G : Coverity fixes
Coverity minor fixes Signed-off-by: Krishna Kumar S R <[email protected]>
1 parent e87ff2a commit abe8b90

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

drivers/net/ethernet/altera/intel_fpga_eth_main.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -326,12 +326,12 @@ static int xtile_init_rx_buffer(struct intel_fpga_xtile_eth_private *priv,
326326
struct altera_dma_buffer *rxbuffer,
327327
int len)
328328
{
329-
rxbuffer->skb = netdev_alloc_skb(priv->dev, len);
330-
skb_reserve(rxbuffer->skb, SKB_DMA_REALIGN);
329+
rxbuffer->skb = netdev_alloc_skb(priv->dev, len);
331330

332-
if (!rxbuffer->skb)
333-
return -ENOMEM;
331+
if (!rxbuffer->skb)
332+
return -ENOMEM;
334333

334+
skb_reserve(rxbuffer->skb, SKB_DMA_REALIGN);
335335
rxbuffer->dma_addr = dma_map_single(priv->device,
336336
rxbuffer->skb->data,
337337
len, DMA_FROM_DEVICE);
@@ -1576,15 +1576,16 @@ static int intel_fpga_xtile_validate(struct phylink_pcs *pcs,
15761576
const struct phylink_link_state *state_validate)
15771577
{
15781578
struct phylink_link_state *state = (struct phylink_link_state *)state_validate;
1579-
intel_fpga_xtile_eth_private *priv =
1580-
container_of(pcs, intel_fpga_xtile_eth_private, pcs);
1579+
intel_fpga_xtile_eth_private *priv = NULL;
1580+
1581+
if (!pcs)
1582+
return -EINVAL;
1583+
1584+
priv = container_of(pcs, intel_fpga_xtile_eth_private, pcs);
15811585

15821586
__ETHTOOL_DECLARE_LINK_MODE_MASK(mac_supported) = { 0, };
15831587
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
15841588

1585-
if (!priv)
1586-
return -EINVAL;
1587-
15881589
if (state->interface != PHY_INTERFACE_MODE_NA &&
15891590
state->interface != PHY_INTERFACE_MODE_10GKR &&
15901591
state->interface != PHY_INTERFACE_MODE_10GBASER &&
@@ -1653,13 +1654,12 @@ static int intel_fpga_xtile_validate(struct phylink_pcs *pcs,
16531654
static void intel_fpga_xtile_mac_pcs_get_state(struct phylink_pcs *pcs,
16541655
struct phylink_link_state *state)
16551656
{
1657+
if (!pcs)
1658+
return;
16561659
/* fixed speed for now */
16571660
intel_fpga_xtile_eth_private *priv =
16581661
container_of(pcs, intel_fpga_xtile_eth_private, pcs);
16591662

1660-
if (!priv)
1661-
return;
1662-
16631663
state->speed = priv->link_speed;
16641664
state->duplex = DUPLEX_FULL;
16651665
state->link = 1;
@@ -2135,8 +2135,8 @@ static int intel_fpga_xtile_probe(struct platform_device *pdev)
21352135
ret = of_property_read_string(pdev->dev.of_node, "if_name",
21362136
&if_name);
21372137

2138-
if (if_name) {
2139-
memset(&ndev->name, 0, 16);
2138+
if (if_name && (strlen(if_name) < ARRAY_SIZE(ndev->name)-1)) {
2139+
memset(&ndev->name, 0, ARRAY_SIZE(ndev->name));
21402140
memcpy(ndev->name, if_name, strlen(if_name));
21412141
}
21422142

drivers/net/ethernet/altera/intel_fpga_gts_ethtool.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,9 +1649,9 @@ static int gts_set_pauseparam(struct net_device *dev,
16491649
static int gts_get_ts_info(struct net_device *dev,
16501650
struct kernel_ethtool_ts_info *info)
16511651
{
1652-
intel_fpga_xtile_eth_private *priv = netdev_priv(dev);
1653-
16541652
return -EOPNOTSUPP;
1653+
#if 0
1654+
intel_fpga_xtile_eth_private *priv = netdev_priv(dev);
16551655

16561656
info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |
16571657
SOF_TIMESTAMPING_RX_HARDWARE |
@@ -1668,8 +1668,8 @@ static int gts_get_ts_info(struct net_device *dev,
16681668

16691669
info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |
16701670
(1 << HWTSTAMP_FILTER_ALL);
1671-
16721671
return 0;
1672+
#endif
16731673
}
16741674

16751675
/* Set link ksettings (phy address, speed) for ethtools */

drivers/net/ethernet/altera/intel_fpga_hssigl_driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ int hssigldrv_probe_init(struct platform_device *pdev)
4040
return -ENOENT;
4141

4242
pdev_tr = of_find_device_by_node(dev_tr);
43-
if (!dev_tr) {
43+
if (!pdev_tr) {
4444
of_node_put(dev_tr);
4545
return -ENODEV;
4646
}

0 commit comments

Comments
 (0)