Skip to contentSkip to conversation

e1000e: Add pm_qos header

PATCH Applied David Ahern 3 participants 5 messages May 12, 2015 – May 13, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 e1000e: Add pm_qos header

Commit e2c6544829f moved pm_qos_req to e1000_adapter. Add the header file that defines the struct.

Cc Thomas Graf <[email protected]>
Cc Jeff Kirsher <[email protected]>
---
 drivers/net/ethernet/intel/e1000e/e1000.h | 1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/e1000e/e1000.h +1 -0
index 5d9ceb17b4cb..0abc942c966e 100644
@@ -40,6 +40,7 @@
 #include <linux/ptp_classify.h>
 #include <linux/mii.h>
 #include <linux/mdio.h>
+#include <linux/pm_qos.h>
 #include "hw.h"
 
 struct e1000_info;
Signature · 1 line
2.2.1
#1 lore raw

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

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

---
 include/linux/netdevice.h | 3 ---
 1 file changed, 3 deletions(-)
include/linux/netdevice.h +0 -3
index a6d706b2a947..6317012ec1e1 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
maintainer Applied
#2 lore raw

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

From: David Ahern <[email protected]>
Date: Tue, 12 May 2015 09:37:00 -0600

Quoted 4 lines

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

Applied.