Commit c7f6250a authored by Stefan Wahren's avatar Stefan Wahren Committed by David S. Miller
Browse files

qca_spi: Add QCASPI prefix to ring defines 



All defines in qca_spi.h except of the two ring limit defines have
a QCASPI prefix. Since the name is quite generic add the QCASPI prefix
to avoid possible name conflicts.

Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22d70f69

drivers/net/ethernet/qualcomm/qca_debug.c

+3 −3
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ qcaspi_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring, 
	struct qcaspi *qca = netdev_priv(dev);



	ring->rx_max_pending = QCASPI_RX_MAX_FRAMES;

	ring->tx_max_pending = TX_RING_MAX_LEN;

	ring->tx_max_pending = QCASPI_TX_RING_MAX_LEN;

	ring->rx_pending = QCASPI_RX_MAX_FRAMES;

	ring->tx_pending = qca->txr.count;

}
@@ -275,8 +275,8 @@ qcaspi_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ring, 
	if (qca->spi_thread)

		kthread_park(qca->spi_thread);



	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 = max_t(u32, ring->tx_pending, QCASPI_TX_RING_MIN_LEN);

	qca->txr.count = min_t(u16, qca->txr.count, QCASPI_TX_RING_MAX_LEN);



	if (qca->spi_thread)

		kthread_unpark(qca->spi_thread);

drivers/net/ethernet/qualcomm/qca_spi.c

+2 −2
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ qcaspi_flush_tx_ring(struct qcaspi *qca) 
	 * has been replaced by netif_tx_lock_bh() and so on.

	 */

	netif_tx_lock_bh(qca->net_dev);

	for (i = 0; i < TX_RING_MAX_LEN; i++) {

	for (i = 0; i < QCASPI_TX_RING_MAX_LEN; i++) {

		if (qca->txr.skb[i]) {

			dev_kfree_skb(qca->txr.skb[i]);

			qca->txr.skb[i] = NULL;
@@ -890,7 +890,7 @@ qcaspi_netdev_setup(struct net_device *dev) 
	memset(qca, 0, sizeof(struct qcaspi));



	memset(&qca->txr, 0, sizeof(qca->txr));

	qca->txr.count = TX_RING_MAX_LEN;

	qca->txr.count = QCASPI_TX_RING_MAX_LEN;

}



static const struct of_device_id qca_spi_of_match[] = {

drivers/net/ethernet/qualcomm/qca_spi.h

+3 −3
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 


#define QCASPI_GOOD_SIGNATURE 0xAA55



#define TX_RING_MAX_LEN 10

#define TX_RING_MIN_LEN 2

#define QCASPI_TX_RING_MAX_LEN 10

#define QCASPI_TX_RING_MIN_LEN 2



/* sync related constants */

#define QCASPI_SYNC_UNKNOWN 0
@@ -54,7 +54,7 @@ 
#define QCASPI_EVENT_CPUON  1



struct tx_ring {

	struct sk_buff *skb[TX_RING_MAX_LEN];

	struct sk_buff *skb[QCASPI_TX_RING_MAX_LEN];

	u16 head;

	u16 tail;

	u16 size;