Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f2bef2c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: clean ioctl debug message"

parents 49c219af f0e3a32d

drivers/net/wireless/ath/wil6210/ioctl.c

+11 −3
Original line number Diff line number Diff line
@@ -215,15 +215,23 @@ out_free: 
}

int wil_ioctl(struct wil6210_priv *wil, void __user *data, int cmd)

{

	int ret;



	switch (cmd) {

	case WIL_IOCTL_MEMIO:

		return wil_ioc_memio_dword(wil, data);

		ret = wil_ioc_memio_dword(wil, data);

		break;

	case WIL_IOCTL_MEMIO_BLOCK:

		return wil_ioc_memio_block(wil, data);

		ret = wil_ioc_memio_block(wil, data);

		break;

	case (SIOCDEVPRIVATE + 1):

		return wil_ioc_android(wil, data);

		ret = wil_ioc_android(wil, data);

		break;

	default:

		wil_dbg_ioctl(wil, "Unsupported IOCTL 0x%04x\n", cmd);

		return -ENOIOCTLCMD;

	}



	wil_dbg_ioctl(wil, "ioctl(0x%04x) -> %d\n", cmd, ret);

	return ret;

}

drivers/net/wireless/ath/wil6210/netdev.c

+1 −5
Original line number Diff line number Diff line
@@ -60,11 +60,7 @@ static int wil_do_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd) 
{

	struct wil6210_priv *wil = ndev_to_wil(ndev);



	int ret = wil_ioctl(wil, ifr->ifr_data, cmd);



	wil_dbg_misc(wil, "ioctl(0x%04x) -> %d\n", cmd, ret);



	return ret;

	return wil_ioctl(wil, ifr->ifr_data, cmd);

}



static const struct net_device_ops wil_netdev_ops = {