net: Remove remaining remnants of pm_qos from netdevice.h

PATCH Applied David Ahern 2 participants 4 messages May 9, 2015 – May 11, 2015

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

David Ahern

author

2015-05-09 22:22 UTC #0 lore raw

PATCH 1/1 net: Remove remaining remnants of pm_qos from netdevice.h

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

Signed-off-by David Ahern <[email protected]>

Cc Thomas Graf <[email protected]>

---
 include/linux/netdevice.h | 3 ---
 1 file changed, 3 deletions(-)

include/linux/netdevice.h +0 -3

index 1899c74a7127..05b9a694e213 100644
@@ -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.
  */

Signature · 1 line

2.2.1

David Miller

maintainer Applied

2015-05-11 17:11 UTC #1 lore raw

From: David Ahern <[email protected]>
Date: Sat, 9 May 2015 16:21:43 -0600

Quoted 4 lines

Commit e2c6544829f removed pm_qos from struct net_device but left the comment above header file. Remove those.
Signed-off-by David Ahern <[email protected]>

Applied, thanks David.

David Miller

maintainer

2015-05-11 17:26 UTC #2 lore raw

From: David Miller <[email protected]>
Date: Mon, 11 May 2015 13:11:06 -0400 (EDT)

Quoted 9 lines

From: David Ahern <[email protected]>
Date: Sat, 9 May 2015 16:21:43 -0600
Quoted 4 lines
Commit e2c6544829f removed pm_qos from struct net_device but left the comment above header file. Remove those.
Signed-off-by David Ahern <[email protected]>
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;
                        ^

David Ahern

author

2015-05-11 17:27 UTC #3 lore raw

Quoted 15 lines · David Miller

From: David Miller <[email protected]>
Date: Mon, 11 May 2015 13:11:06 -0400 (EDT)
Quoted 9 lines
From: David Ahern <[email protected]>
Date: Sat, 9 May 2015 16:21:43 -0600
Quoted 4 lines
Commit e2c6544829f removed pm_qos from struct net_device but left the comment above header file. Remove those.
Signed-off-by David Ahern <[email protected]>
Applied, thanks David.
Actually I had to revert as this breaks the build.

Quoted 8 lines

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