[v5,1/5] soc: qcom: smem_state: Fix include for ERR_PTR()

Message ID 1479190014-11297-1-git-send-email-bjorn.andersson@linaro.org
State New
Headers show

Commit Message

Bjorn Andersson Nov. 15, 2016, 6:06 a.m.
The correct include file for getting errno constants and ERR_PTR() is
linux/err.h, rather than linux/errno.h, so fix the include.

Fixes: e8b123e60084 ("soc: qcom: smem_state: Add stubs for disabled smem_state")
Acked-by: Andy Gross <andy.gross@linaro.org>

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

---

Kalle, please merge this patch through your tree.

Changes since v4:
- New patch

 include/linux/soc/qcom/smem_state.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Kalle Valo Nov. 16, 2016, 6:49 p.m. | #1
Bjorn Andersson <bjorn.andersson@linaro.org> wrote:
> The correct include file for getting errno constants and ERR_PTR() is

> linux/err.h, rather than linux/errno.h, so fix the include.

> 

> Fixes: e8b123e60084 ("soc: qcom: smem_state: Add stubs for disabled smem_state")

> Acked-by: Andy Gross <andy.gross@linaro.org>

> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>


For some reason this fails to compile now. Can you take a look, please?

ERROR: "qcom_wcnss_open_channel" [drivers/net/wireless/ath/wcn36xx/wcn36xx.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2

5 patches set to Changes Requested.

9429045 [v5,1/5] soc: qcom: smem_state: Fix include for ERR_PTR()
9429047 [v5,2/5] wcn36xx: Transition driver to SMD client
9429037 [v5,3/5] wcn36xx: Implement firmware assisted scan
9429043 [v5,4/5] wcn36xx: Implement print_reg indication
9429023 [v5,5/5] wcn36xx: Don't use the destroyed hal_mutex

-- 
https://patchwork.kernel.org/patch/9429045/

Documentation about submitting wireless patches and checking status
from patchwork:

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kalle Valo Nov. 22, 2016, 2:55 p.m. | #2
Bjorn Andersson <bjorn.andersson@linaro.org> writes:

> On Wed 16 Nov 10:49 PST 2016, Kalle Valo wrote:

>

>> Bjorn Andersson <bjorn.andersson@linaro.org> wrote:

>> > The correct include file for getting errno constants and ERR_PTR() is

>> > linux/err.h, rather than linux/errno.h, so fix the include.

>> > 

>> > Fixes: e8b123e60084 ("soc: qcom: smem_state: Add stubs for disabled smem_state")

>> > Acked-by: Andy Gross <andy.gross@linaro.org>

>> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

>> 

>> For some reason this fails to compile now. Can you take a look, please?

>> 

>> ERROR: "qcom_wcnss_open_channel" [drivers/net/wireless/ath/wcn36xx/wcn36xx.ko] undefined!

>> make[1]: *** [__modpost] Error 1

>> make: *** [modules] Error 2

>> 

>> 5 patches set to Changes Requested.

>> 

>> 9429045 [v5,1/5] soc: qcom: smem_state: Fix include for ERR_PTR()

>> 9429047 [v5,2/5] wcn36xx: Transition driver to SMD client

>

> This patch was updated with the necessary depends in Kconfig to catch

> this exact issue and when I pull in your .config (which has QCOM_SMD=n,

> QCOM_WCNSS_CTRL=n and WCN36XX=y) I can build this just fine.

>

> I've tested the various combinations and it seems to work fine. Do you

> have any other patches in your tree?


This was with the pending branch of my ath.git tree. There are other
wireless patches (ath10k etc) but I would guess they don't affect here.

> Any stale objects?


Not sure what you mean with this question, but I didn't run 'make clean'
if that's what you are asking.

> Would you mind retesting this, before I invest more time in trying to

> reproduce the issue you're seeing?


Sure, I'll take a look but that might take few days.

-- 
Kalle Valo--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kalle Valo Nov. 30, 2016, 6:40 p.m. | #3
"Valo, Kalle" <kvalo@qca.qualcomm.com> writes:

> Bjorn Andersson <bjorn.andersson@linaro.org> writes:

>

>> On Wed 16 Nov 10:49 PST 2016, Kalle Valo wrote:

>>

>>> Bjorn Andersson <bjorn.andersson@linaro.org> wrote:

>>> > The correct include file for getting errno constants and ERR_PTR() is

>>> > linux/err.h, rather than linux/errno.h, so fix the include.

>>> > 

>>> > Fixes: e8b123e60084 ("soc: qcom: smem_state: Add stubs for disabled smem_state")

>>> > Acked-by: Andy Gross <andy.gross@linaro.org>

>>> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

>>> 

>>> For some reason this fails to compile now. Can you take a look, please?

>>> 

>>> ERROR: "qcom_wcnss_open_channel" [drivers/net/wireless/ath/wcn36xx/wcn36xx.ko] undefined!

>>> make[1]: *** [__modpost] Error 1

>>> make: *** [modules] Error 2

>>> 

>>> 5 patches set to Changes Requested.

>>> 

>>> 9429045 [v5,1/5] soc: qcom: smem_state: Fix include for ERR_PTR()

>>> 9429047 [v5,2/5] wcn36xx: Transition driver to SMD client

>>

>> This patch was updated with the necessary depends in Kconfig to catch

>> this exact issue and when I pull in your .config (which has QCOM_SMD=n,

>> QCOM_WCNSS_CTRL=n and WCN36XX=y) I can build this just fine.

>>

>> I've tested the various combinations and it seems to work fine. Do you

>> have any other patches in your tree?

>

> This was with the pending branch of my ath.git tree. There are other

> wireless patches (ath10k etc) but I would guess they don't affect here.

>

>> Any stale objects?

>

> Not sure what you mean with this question, but I didn't run 'make clean'

> if that's what you are asking.

>

>> Would you mind retesting this, before I invest more time in trying to

>> reproduce the issue you're seeing?

>

> Sure, I'll take a look but that might take few days.


I didn't find enough time to look at this in detail. I applied this to
my ath.git pending branch, let's see what the kbuild bot finds.

-- 
Kalle Valo--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kalle Valo Dec. 1, 2016, 5:13 a.m. | #4
Kalle Valo <kvalo@qca.qualcomm.com> writes:

> "Valo, Kalle" <kvalo@qca.qualcomm.com> writes:

>

>> Bjorn Andersson <bjorn.andersson@linaro.org> writes:

>>

>>> On Wed 16 Nov 10:49 PST 2016, Kalle Valo wrote:

>>>

>>>> Bjorn Andersson <bjorn.andersson@linaro.org> wrote:

>>>> > The correct include file for getting errno constants and ERR_PTR() is

>>>> > linux/err.h, rather than linux/errno.h, so fix the include.

>>>> > 

>>>> > Fixes: e8b123e60084 ("soc: qcom: smem_state: Add stubs for disabled smem_state")

>>>> > Acked-by: Andy Gross <andy.gross@linaro.org>

>>>> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

>>>> 

>>>> For some reason this fails to compile now. Can you take a look, please?

>>>> 

>>>> ERROR: "qcom_wcnss_open_channel" [drivers/net/wireless/ath/wcn36xx/wcn36xx.ko] undefined!

>>>> make[1]: *** [__modpost] Error 1

>>>> make: *** [modules] Error 2

>>>> 

>>>> 5 patches set to Changes Requested.

>>>> 

>>>> 9429045 [v5,1/5] soc: qcom: smem_state: Fix include for ERR_PTR()

>>>> 9429047 [v5,2/5] wcn36xx: Transition driver to SMD client

>>>

>>> This patch was updated with the necessary depends in Kconfig to catch

>>> this exact issue and when I pull in your .config (which has QCOM_SMD=n,

>>> QCOM_WCNSS_CTRL=n and WCN36XX=y) I can build this just fine.

>>>

>>> I've tested the various combinations and it seems to work fine. Do you

>>> have any other patches in your tree?

>>

>> This was with the pending branch of my ath.git tree. There are other

>> wireless patches (ath10k etc) but I would guess they don't affect here.

>>

>>> Any stale objects?

>>

>> Not sure what you mean with this question, but I didn't run 'make clean'

>> if that's what you are asking.

>>

>>> Would you mind retesting this, before I invest more time in trying to

>>> reproduce the issue you're seeing?

>>

>> Sure, I'll take a look but that might take few days.

>

> I didn't find enough time to look at this in detail. I applied this to

> my ath.git pending branch, let's see what the kbuild bot finds.


It found the same problem. Interestingly I'm also building x86 with 32
bit, maybe it's related?

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git pending
head:   1ea16a1c457939b4564643f7637d5cc639a8d3b7
commit: 5eb09c672b01460804fd49b1c9cc7d1072a102f0 [96/99] wcn36xx: Transition driver to SMD client
config: i386-allmodconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        git checkout 5eb09c672b01460804fd49b1c9cc7d1072a102f0
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

>> ERROR: "qcom_wcnss_open_channel" [drivers/net/wireless/ath/wcn36xx/wcn36xx.ko] undefined!


-- 
Kalle Valo--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kalle Valo Dec. 1, 2016, 10:17 a.m. | #5
Kalle Valo <kvalo@qca.qualcomm.com> writes:

> Kalle Valo <kvalo@qca.qualcomm.com> writes:

>

>> "Valo, Kalle" <kvalo@qca.qualcomm.com> writes:

>>

>>> Bjorn Andersson <bjorn.andersson@linaro.org> writes:

>>>

>>>> On Wed 16 Nov 10:49 PST 2016, Kalle Valo wrote:

>>>>

>>>>> Bjorn Andersson <bjorn.andersson@linaro.org> wrote:

>>>>> > The correct include file for getting errno constants and ERR_PTR() is

>>>>> > linux/err.h, rather than linux/errno.h, so fix the include.

>>>>> > 

>>>>> > Fixes: e8b123e60084 ("soc: qcom: smem_state: Add stubs for disabled smem_state")

>>>>> > Acked-by: Andy Gross <andy.gross@linaro.org>

>>>>> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

>>>>> 

>>>>> For some reason this fails to compile now. Can you take a look, please?

>>>>> 

>>>>> ERROR: "qcom_wcnss_open_channel" [drivers/net/wireless/ath/wcn36xx/wcn36xx.ko] undefined!

>>>>> make[1]: *** [__modpost] Error 1

>>>>> make: *** [modules] Error 2

>>>>> 

>>>>> 5 patches set to Changes Requested.

>>>>> 

>>>>> 9429045 [v5,1/5] soc: qcom: smem_state: Fix include for ERR_PTR()

>>>>> 9429047 [v5,2/5] wcn36xx: Transition driver to SMD client

>>>>

>>>> This patch was updated with the necessary depends in Kconfig to catch

>>>> this exact issue and when I pull in your .config (which has QCOM_SMD=n,

>>>> QCOM_WCNSS_CTRL=n and WCN36XX=y) I can build this just fine.

>>>>

>>>> I've tested the various combinations and it seems to work fine. Do you

>>>> have any other patches in your tree?

>>>

>>> This was with the pending branch of my ath.git tree. There are other

>>> wireless patches (ath10k etc) but I would guess they don't affect here.

>>>

>>>> Any stale objects?

>>>

>>> Not sure what you mean with this question, but I didn't run 'make clean'

>>> if that's what you are asking.

>>>

>>>> Would you mind retesting this, before I invest more time in trying to

>>>> reproduce the issue you're seeing?

>>>

>>> Sure, I'll take a look but that might take few days.

>>

>> I didn't find enough time to look at this in detail. I applied this to

>> my ath.git pending branch, let's see what the kbuild bot finds.

>

> It found the same problem. Interestingly I'm also building x86 with 32

> bit, maybe it's related?

>

> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git pending

> head:   1ea16a1c457939b4564643f7637d5cc639a8d3b7

> commit: 5eb09c672b01460804fd49b1c9cc7d1072a102f0 [96/99] wcn36xx: Transition driver to SMD client

> config: i386-allmodconfig (attached as .config)

> compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901

> reproduce:

>         git checkout 5eb09c672b01460804fd49b1c9cc7d1072a102f0

>         # save the attached .config to linux build tree

>         make ARCH=i386 

>

> All errors (new ones prefixed by >>):

>

>>> ERROR: "qcom_wcnss_open_channel" [drivers/net/wireless/ath/wcn36xx/wcn36xx.ko] undefined!


Bjorn mentioned me on IRC that this is because of a missing commit in my
tree:

daa6e41ce2b5 soc: qcom: wcnss_ctrl: Stub wcnss_ctrl API

When I pull the tag below (which contains the above commit) wcn36xx
builds fine for me:

git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git tags/qcom-drivers-for-4.10

Andy, is it ok if I pull your tag also to my ath.git tree to solve the
wcn36xx build problem? My trees go to Linus via net-next and I don't
know when exactly Dave would send a pull request to Linus, before or
after the arm trees, but as the tag seems to contain only few patches I
hope it doesn't matter.

-- 
Kalle Valo--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch hide | download patch | download mbox

diff --git a/include/linux/soc/qcom/smem_state.h b/include/linux/soc/qcom/smem_state.h
index 7b88697929e9..b8478ee7a71f 100644
--- a/include/linux/soc/qcom/smem_state.h
+++ b/include/linux/soc/qcom/smem_state.h
@@ -1,7 +1,7 @@ 
 #ifndef __QCOM_SMEM_STATE__
 #define __QCOM_SMEM_STATE__
 
-#include <linux/errno.h>
+#include <linux/err.h>
 
 struct device_node;
 struct qcom_smem_state;