* [PATCH 57/86] brcm80211: use uapi/linux/pci_ids.h directly
[not found] <1427635734-24786-1-git-send-email-mst@redhat.com>
@ 2015-03-29 13:41 ` Michael S. Tsirkin
2015-03-29 16:45 ` Arend van Spriel
2015-03-29 13:43 ` [PATCH 83/86] brcm80211: drop pci dependency Michael S. Tsirkin
2015-03-29 13:43 ` [PATCH 84/86] brcm80211: drop pci_ids include Michael S. Tsirkin
2 siblings, 1 reply; 6+ messages in thread
From: Michael S. Tsirkin @ 2015-03-29 13:41 UTC (permalink / raw)
To: linux-kernel
Cc: Brett Rudley, Arend van Spriel, Franky (Zhenhui) Lin,
Hante Meuleman, Kalle Valo, Pieter-Paul Giesberts,
John W. Linville, Mika Westerberg, Hans de Goede,
Daniel (Deognyoun) Kim, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?=,
Julia Lawall, Brian Norris, Dan Carpenter, Markus Elfring,
linux-wireless, brcm80211-dev-list, netdev
Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h,
use the new header directly so we can drop
the wrapper in include/linux/pci_ids.h.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | 2 +-
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 +-
drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 2 +-
drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
index 2124a17..bd1370e 100644
--- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
+++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
@@ -17,7 +17,7 @@
#ifndef _BRCM_HW_IDS_H_
#define _BRCM_HW_IDS_H_
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
#include <linux/mmc/sdio_ids.h>
#define BRCM_USB_VENDOR_ID_BROADCOM 0x0a5c
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 7944224..227cb33 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -18,7 +18,7 @@
#include <linux/types.h>
#include <linux/netdevice.h>
#include <linux/pci.h>
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
#include <linux/sched.h>
#include <linux/completion.h>
#include <linux/scatterlist.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
index faec35c..5c4755d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
@@ -18,7 +18,7 @@
#include <linux/kernel.h>
#include <linux/kthread.h>
#include <linux/printk.h>
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
#include <linux/netdevice.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index eb8584a..de0ef7bb 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -17,7 +17,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
#include <linux/if_ether.h>
#include <net/cfg80211.h>
#include <net/mac80211.h>
--
MST
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 57/86] brcm80211: use uapi/linux/pci_ids.h directly
2015-03-29 13:41 ` [PATCH 57/86] brcm80211: use uapi/linux/pci_ids.h directly Michael S. Tsirkin
@ 2015-03-29 16:45 ` Arend van Spriel
0 siblings, 0 replies; 6+ messages in thread
From: Arend van Spriel @ 2015-03-29 16:45 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: linux-kernel, Brett Rudley, Franky (Zhenhui) Lin, Hante Meuleman,
Kalle Valo, Pieter-Paul Giesberts, John W. Linville,
Mika Westerberg, Hans de Goede, Daniel (Deognyoun) Kim,
Rafał Miłecki, Julia Lawall, Brian Norris,
Dan Carpenter, Markus Elfring, linux-wireless, brcm80211-dev-list,
netdev
On 03/29/15 15:41, Michael S. Tsirkin wrote:
> Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h,
> use the new header directly so we can drop
> the wrapper in include/linux/pci_ids.h.
Acked-by: Arend van Spriel <arend@broadcom.com>
> Signed-off-by: Michael S. Tsirkin<mst@redhat.com>
> ---
> drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | 2 +-
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 +-
> drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 2 +-
> drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
> index 2124a17..bd1370e 100644
> --- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
> +++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
> @@ -17,7 +17,7 @@
> #ifndef _BRCM_HW_IDS_H_
> #define _BRCM_HW_IDS_H_
>
> -#include<linux/pci_ids.h>
> +#include<uapi/linux/pci_ids.h>
> #include<linux/mmc/sdio_ids.h>
>
> #define BRCM_USB_VENDOR_ID_BROADCOM 0x0a5c
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> index 7944224..227cb33 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> @@ -18,7 +18,7 @@
> #include<linux/types.h>
> #include<linux/netdevice.h>
> #include<linux/pci.h>
> -#include<linux/pci_ids.h>
> +#include<uapi/linux/pci_ids.h>
I was surprised seeing this include here, but you deal with that in
subsequent patches. Thanks.
Regards,
Arend
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 83/86] brcm80211: drop pci dependency
[not found] <1427635734-24786-1-git-send-email-mst@redhat.com>
2015-03-29 13:41 ` [PATCH 57/86] brcm80211: use uapi/linux/pci_ids.h directly Michael S. Tsirkin
@ 2015-03-29 13:43 ` Michael S. Tsirkin
2015-03-29 16:46 ` Arend van Spriel
2015-03-29 13:43 ` [PATCH 84/86] brcm80211: drop pci_ids include Michael S. Tsirkin
2 siblings, 1 reply; 6+ messages in thread
From: Michael S. Tsirkin @ 2015-03-29 13:43 UTC (permalink / raw)
To: linux-kernel
Cc: Brett Rudley, Arend van Spriel, Franky (Zhenhui) Lin,
Hante Meuleman, Kalle Valo, Pieter-Paul Giesberts,
John W. Linville, Chen-Yu Tsai, Hans de Goede, linux-wireless,
brcm80211-dev-list, netdev
This file does not use any pci APIs, drop
pci header includes.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 227cb33..9331486 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -17,8 +17,6 @@
#include <linux/types.h>
#include <linux/netdevice.h>
-#include <linux/pci.h>
-#include <uapi/linux/pci_ids.h>
#include <linux/sched.h>
#include <linux/completion.h>
#include <linux/scatterlist.h>
--
MST
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 83/86] brcm80211: drop pci dependency
2015-03-29 13:43 ` [PATCH 83/86] brcm80211: drop pci dependency Michael S. Tsirkin
@ 2015-03-29 16:46 ` Arend van Spriel
0 siblings, 0 replies; 6+ messages in thread
From: Arend van Spriel @ 2015-03-29 16:46 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: linux-kernel, Brett Rudley, Franky (Zhenhui) Lin, Hante Meuleman,
Kalle Valo, Pieter-Paul Giesberts, John W. Linville, Chen-Yu Tsai,
Hans de Goede, linux-wireless, brcm80211-dev-list, netdev
On 03/29/15 15:43, Michael S. Tsirkin wrote:
> This file does not use any pci APIs, drop
> pci header includes.
Acked-by: Arend van Spriel <arend@broadcom.com>
> Signed-off-by: Michael S. Tsirkin<mst@redhat.com>
> ---
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> index 227cb33..9331486 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> @@ -17,8 +17,6 @@
>
> #include<linux/types.h>
> #include<linux/netdevice.h>
> -#include<linux/pci.h>
> -#include<uapi/linux/pci_ids.h>
> #include<linux/sched.h>
> #include<linux/completion.h>
> #include<linux/scatterlist.h>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 84/86] brcm80211: drop pci_ids include
[not found] <1427635734-24786-1-git-send-email-mst@redhat.com>
2015-03-29 13:41 ` [PATCH 57/86] brcm80211: use uapi/linux/pci_ids.h directly Michael S. Tsirkin
2015-03-29 13:43 ` [PATCH 83/86] brcm80211: drop pci dependency Michael S. Tsirkin
@ 2015-03-29 13:43 ` Michael S. Tsirkin
2015-03-29 16:47 ` Arend van Spriel
2 siblings, 1 reply; 6+ messages in thread
From: Michael S. Tsirkin @ 2015-03-29 13:43 UTC (permalink / raw)
To: linux-kernel
Cc: Brett Rudley, Arend van Spriel, Franky (Zhenhui) Lin,
Hante Meuleman, Kalle Valo, Pieter-Paul Giesberts,
John W. Linville, Daniel Kim, linux-wireless, brcm80211-dev-list,
netdev
This file does not use any pci ids, drop
pci_ids.h include.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
index 5c4755d..da479d4 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
#include <linux/kthread.h>
#include <linux/printk.h>
-#include <uapi/linux/pci_ids.h>
#include <linux/netdevice.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
--
MST
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 84/86] brcm80211: drop pci_ids include
2015-03-29 13:43 ` [PATCH 84/86] brcm80211: drop pci_ids include Michael S. Tsirkin
@ 2015-03-29 16:47 ` Arend van Spriel
0 siblings, 0 replies; 6+ messages in thread
From: Arend van Spriel @ 2015-03-29 16:47 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: linux-kernel, Brett Rudley, Franky (Zhenhui) Lin, Hante Meuleman,
Kalle Valo, Pieter-Paul Giesberts, John W. Linville, Daniel Kim,
linux-wireless, brcm80211-dev-list, netdev
On 03/29/15 15:43, Michael S. Tsirkin wrote:
> This file does not use any pci ids, drop
> pci_ids.h include.
Acked-by: Arend van Spriel <arend@broadcom.com>
> Signed-off-by: Michael S. Tsirkin<mst@redhat.com>
> ---
> drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
> index 5c4755d..da479d4 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
> @@ -18,7 +18,6 @@
> #include<linux/kernel.h>
> #include<linux/kthread.h>
> #include<linux/printk.h>
> -#include<uapi/linux/pci_ids.h>
> #include<linux/netdevice.h>
> #include<linux/interrupt.h>
> #include<linux/sched.h>
^ permalink raw reply [flat|nested] 6+ messages in thread