net: qualcomm: move qcaspi_tx_cmd to qca_spi.c (55b7a770) · Commits · 戴 / test

drivers/net/ethernet/qualcomm/qca_7k.c

+0 −24

Original line number	Diff line number	Diff line
		@@ -121,27 +121,3 @@ qcaspi_write_register(struct qcaspi *qca, u16 reg, u16 value)

		return ret;
		}

		int
		qcaspi_tx_cmd(struct qcaspi *qca, u16 cmd)
		{
		__be16 tx_data;
		struct spi_message *msg = &qca->spi_msg1;
		struct spi_transfer *transfer = &qca->spi_xfer1;
		int ret;

		tx_data = cpu_to_be16(cmd);
		transfer->len = sizeof(tx_data);
		transfer->tx_buf = &tx_data;
		transfer->rx_buf = NULL;

		ret = spi_sync(qca->spi_dev, msg);

		if (!ret)
		ret = msg->status;

		if (ret)
		qcaspi_spi_error(qca);

		return ret;
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -67,6 +67,5 @@
		void qcaspi_spi_error(struct qcaspi *qca);
		int qcaspi_read_register(struct qcaspi qca, u16 reg, u16 result);
		int qcaspi_write_register(struct qcaspi *qca, u16 reg, u16 value);
		int qcaspi_tx_cmd(struct qcaspi *qca, u16 cmd);

		#endif /* _QCA_7K_H */

+24 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,30 @@ qcaspi_read_legacy(struct qcaspi qca, u8 dst, u32 len)
		return len;
		}

		static int
		qcaspi_tx_cmd(struct qcaspi *qca, u16 cmd)
		{
		__be16 tx_data;
		struct spi_message *msg = &qca->spi_msg1;
		struct spi_transfer *transfer = &qca->spi_xfer1;
		int ret;

		tx_data = cpu_to_be16(cmd);
		transfer->len = sizeof(tx_data);
		transfer->tx_buf = &tx_data;
		transfer->rx_buf = NULL;

		ret = spi_sync(qca->spi_dev, msg);

		if (!ret)
		ret = msg->status;

		if (ret)
		qcaspi_spi_error(qca);

		return ret;
		}

		static int
		qcaspi_tx_frame(struct qcaspi qca, struct sk_buff skb)
		{