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

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

Merge "wil6210: remove HALP voting in debugfs ioblob" into msm-4.9

parents b4064239 e6d8b24e

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

+2 −3
Original line number Diff line number Diff line
@@ -524,8 +524,7 @@ static ssize_t wil_read_file_ioblob(struct file *file, char __user *user_buf, 
	if (!buf)

		return -ENOMEM;



	wil_memcpy_fromio_halp_vote(wil_blob->wil, buf,

				    (const volatile void __iomem *)

	wil_memcpy_fromio_32(buf, (const void __iomem *)

			     wil_blob->blob.data + pos, count);



	ret = copy_to_user(user_buf, buf, count);

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

+0 −17
Original line number Diff line number Diff line
@@ -135,14 +135,6 @@ void wil_memcpy_fromio_32(void *dst, const volatile void __iomem *src, 
		*d++ = __raw_readl(s++);

}



void wil_memcpy_fromio_halp_vote(struct wil6210_priv *wil, void *dst,

				 const volatile void __iomem *src, size_t count)

{

	wil_halp_vote(wil);

	wil_memcpy_fromio_32(dst, src, count);

	wil_halp_unvote(wil);

}



void wil_memcpy_toio_32(volatile void __iomem *dst, const void *src,

			size_t count)

{
@@ -153,15 +145,6 @@ void wil_memcpy_toio_32(volatile void __iomem *dst, const void *src, 
		__raw_writel(*s++, d++);

}



void wil_memcpy_toio_halp_vote(struct wil6210_priv *wil,

			       volatile void __iomem *dst,

			       const void *src, size_t count)

{

	wil_halp_vote(wil);

	wil_memcpy_toio_32(dst, src, count);

	wil_halp_unvote(wil);

}



static void wil_disconnect_cid(struct wil6210_priv *wil, int cid,

			       u16 reason_code, bool from_event)

__acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock)

drivers/net/wireless/ath/wil6210/wil6210.h

+0 −6
Original line number Diff line number Diff line
@@ -790,12 +790,6 @@ void wil_memcpy_fromio_32(void *dst, const volatile void __iomem *src, 
			  size_t count);

void wil_memcpy_toio_32(volatile void __iomem *dst, const void *src,

			size_t count);

void wil_memcpy_fromio_halp_vote(struct wil6210_priv *wil, void *dst,

				 const volatile void __iomem *src,

				 size_t count);

void wil_memcpy_toio_halp_vote(struct wil6210_priv *wil,

			       volatile void __iomem *dst,

			       const void *src, size_t count);



void *wil_if_alloc(struct device *dev);

void wil_if_free(struct wil6210_priv *wil);