提交 0324e75d 编写于 作者: S Stefan Wahren 提交者: David S. Miller

net: qualcomm: use net_device_ops instead of direct call

There is no need to export qcaspi_netdev_open and qcaspi_netdev_close
because they are also accessible via the net_device_ops.
Signed-off-by: NStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 00bc2e49
...@@ -275,6 +275,7 @@ qcaspi_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring) ...@@ -275,6 +275,7 @@ qcaspi_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)
static int static int
qcaspi_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ring) qcaspi_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)
{ {
const struct net_device_ops *ops = dev->netdev_ops;
struct qcaspi *qca = netdev_priv(dev); struct qcaspi *qca = netdev_priv(dev);
if ((ring->rx_pending) || if ((ring->rx_pending) ||
...@@ -283,13 +284,13 @@ qcaspi_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ring) ...@@ -283,13 +284,13 @@ qcaspi_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)
return -EINVAL; return -EINVAL;
if (netif_running(dev)) if (netif_running(dev))
qcaspi_netdev_close(dev); ops->ndo_stop(dev);
qca->txr.count = max_t(u32, ring->tx_pending, TX_RING_MIN_LEN); qca->txr.count = max_t(u32, ring->tx_pending, TX_RING_MIN_LEN);
qca->txr.count = min_t(u16, qca->txr.count, TX_RING_MAX_LEN); qca->txr.count = min_t(u16, qca->txr.count, TX_RING_MAX_LEN);
if (netif_running(dev)) if (netif_running(dev))
qcaspi_netdev_open(dev); ops->ndo_open(dev);
return 0; return 0;
} }
......
...@@ -603,7 +603,7 @@ qcaspi_intr_handler(int irq, void *data) ...@@ -603,7 +603,7 @@ qcaspi_intr_handler(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
int static int
qcaspi_netdev_open(struct net_device *dev) qcaspi_netdev_open(struct net_device *dev)
{ {
struct qcaspi *qca = netdev_priv(dev); struct qcaspi *qca = netdev_priv(dev);
...@@ -640,7 +640,7 @@ qcaspi_netdev_open(struct net_device *dev) ...@@ -640,7 +640,7 @@ qcaspi_netdev_open(struct net_device *dev)
return 0; return 0;
} }
int static int
qcaspi_netdev_close(struct net_device *dev) qcaspi_netdev_close(struct net_device *dev)
{ {
struct qcaspi *qca = netdev_priv(dev); struct qcaspi *qca = netdev_priv(dev);
......
...@@ -108,7 +108,4 @@ struct qcaspi { ...@@ -108,7 +108,4 @@ struct qcaspi {
u16 burst_len; u16 burst_len;
}; };
int qcaspi_netdev_open(struct net_device *dev);
int qcaspi_netdev_close(struct net_device *dev);
#endif /* _QCA_SPI_H */ #endif /* _QCA_SPI_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册