[PATCH] net: Remove remaining remnants of pm_qos from netdevice.h

[PATCH] net: Remove remaining remnants of pm_qos from netdevice.h

[David Ahern]

Commit e2c6544829f removed pm_qos from struct net_device but left the
comment above header file. Remove those.

Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Thomas Graf <tgraf@suug.ch>
---
 include/linux/netdevice.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 1899c74a7127..05b9a694e213 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -25,7 +25,6 @@
 #ifndef _LINUX_NETDEVICE_H
 #define _LINUX_NETDEVICE_H
 
-#include <linux/pm_qos.h>
 #include <linux/timer.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
@@ -1499,8 +1498,6 @@ enum netdev_priv_flags {
  *
  *	@qdisc_tx_busylock:	XXX: need comments on this one
  *
- *	@pm_qos_req:	Power Management QoS object
- *
  *	FIXME: cleanup struct net_device such that network protocol info
  *	moves out.
  */
-- 
2.2.1

Re: [PATCH] net: Remove remaining remnants of pm_qos from netdevice.h

[David Miller]

From: David Ahern <dsahern@gmail.com>
Date: Sat,  9 May 2015 16:21:43 -0600

> Commit e2c6544829f removed pm_qos from struct net_device but left the
> comment above header file. Remove those.
> 
> Signed-off-by: David Ahern <dsahern@gmail.com>

Applied, thanks David.

Re: [PATCH] net: Remove remaining remnants of pm_qos from netdevice.h

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Mon, 11 May 2015 13:11:06 -0400 (EDT)

> From: David Ahern <dsahern@gmail.com>
> Date: Sat,  9 May 2015 16:21:43 -0600
> 
>> Commit e2c6544829f removed pm_qos from struct net_device but left the
>> comment above header file. Remove those.
>> 
>> Signed-off-by: David Ahern <dsahern@gmail.com>
> 
> Applied, thanks David.

Actually I had to revert as this breaks the build.

You will need to submit another patch with this one, one that adds an
include of <linux/pm_qos.h> to drivers/net/ethernet/intel/e1000e/e1000.h

In file included from drivers/net/ethernet/intel/e1000e/82571.c:38:0:
drivers/net/ethernet/intel/e1000e/e1000.h:346:24: error: field ‘pm_qos_req’ has incomplete type
  struct pm_qos_request pm_qos_req;
                        ^

Re: [PATCH] net: Remove remaining remnants of pm_qos from netdevice.h

[David Ahern]

On 5/11/15 11:26 AM, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Mon, 11 May 2015 13:11:06 -0400 (EDT)
>
>> From: David Ahern <dsahern@gmail.com>
>> Date: Sat,  9 May 2015 16:21:43 -0600
>>
>>> Commit e2c6544829f removed pm_qos from struct net_device but left the
>>> comment above header file. Remove those.
>>>
>>> Signed-off-by: David Ahern <dsahern@gmail.com>
>>
>> Applied, thanks David.
>
> Actually I had to revert as this breaks the build.
>
> You will need to submit another patch with this one, one that adds an
> include of <linux/pm_qos.h> to drivers/net/ethernet/intel/e1000e/e1000.h
>
> In file included from drivers/net/ethernet/intel/e1000e/82571.c:38:0:
> drivers/net/ethernet/intel/e1000e/e1000.h:346:24: error: field ‘pm_qos_req’ has incomplete type
>    struct pm_qos_request pm_qos_req;
>                          ^
>

crap. I did a VM build with virtio only. Will redo.

David