Commit 47ab2a95 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Kalle Valo
Browse files

orinoco: Remove ezusb_doicmd_wait() 



ezusb_doicmd_wait() is invoked via ->init_cmd_wait() callback.
This callback is only invoked hermesi_program_init() and
hermesi_program_end() which are the ->program_init() and ->program_end()
callbacks as assigned by `hermes_ops_local'. They are never used by the
USB interface since the USB interface provides its own set of callbacks
by `ezusb_ops'.

Replace ezusb_doicmd_wait() with a warning in case I missed the obvious.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201113212252.2243570-9-bigeasy@linutronix.de
parent 39628fe4

drivers/net/wireless/intersil/orinoco/orinoco_usb.c

+2 −19
Original line number Diff line number Diff line
@@ -1052,25 +1052,8 @@ static int ezusb_read_ltv(struct hermes *hw, int bap, u16 rid, 
static int ezusb_doicmd_wait(struct hermes *hw, u16 cmd, u16 parm0, u16 parm1,

			     u16 parm2, struct hermes_response *resp)

{

	struct ezusb_priv *upriv = hw->priv;

	struct request_context *ctx;



	__le16 data[4] = {

		cpu_to_le16(cmd),

		cpu_to_le16(parm0),

		cpu_to_le16(parm1),

		cpu_to_le16(parm2),

	};

	netdev_dbg(upriv->dev,

		   "0x%04X, parm0 0x%04X, parm1 0x%04X, parm2 0x%04X\n", cmd,

		   parm0, parm1, parm2);

	ctx = ezusb_alloc_ctx(upriv, EZUSB_RID_DOCMD, EZUSB_RID_ACK);

	if (!ctx)

		return -ENOMEM;



	return ezusb_access_ltv(upriv, ctx, sizeof(data), &data,

				EZUSB_FRAME_CONTROL, NULL, 0, NULL,

				ezusb_req_ctx_wait);

	WARN_ON_ONCE(1);

	return -EINVAL;

}



static int __ezusb_docmd_wait(struct hermes *hw, u16 cmd, u16 parm0,