backports: add two more SmPL patches
cover backports: add two more SmPL patches
This adds two more SmPL patches (spatches) replacing tons of patches files. The improvements on run time in Coccinelle make it reasonable to integrate these changes due to the gains this provides for automatic porting of collateral evolutions for any new random driver.
Luis R. Rodriguez (3):
backports: convert the 62-usb_driver_lpm patch series to SmPL
backports: convert 11-dev-pm-ops patch series to SmPL
backports: refresh patches for next-20131206 a second time
.../network/11-dev-pm-ops.cocci | 42 ++++++++++++++++++++++ .../network/11-dev-pm-ops/INFO | 9 ----- .../11-dev-pm-ops/drivers_bcma_host_pci.patch | 25 ------------- .../drivers_net_ethernet_atheros_alx_main.patch | 25 ------------- ...ers_net_ethernet_atheros_atl1c_atl1c_main.patch | 25 ------------- .../drivers_net_ethernet_atheros_atlx_atl1.patch | 25 ------------- .../drivers_net_wireless_ath_ath5k_pci.patch | 25 ------------- .../drivers_net_wireless_ath_ath9k_pci.patch | 25 ------------- .../drivers_net_wireless_iwlegacy_common.patch | 8 ++--- .../drivers_net_wireless_iwlwifi_pcie_drv.patch | 25 ------------- .../drivers_net_wireless_mwifiex_pcie.patch | 12 +------ .../drivers_net_wireless_p54_p54pci.patch | 25 ------------- ...drivers_net_wireless_rtlwifi_rtl8188ee_sw.patch | 25 ------------- ...drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch | 25 ------------- ...drivers_net_wireless_rtlwifi_rtl8192de_sw.patch | 25 ------------- ...drivers_net_wireless_rtlwifi_rtl8192se_sw.patch | 25 ------------- ...drivers_net_wireless_rtlwifi_rtl8723ae_sw.patch | 25 ------------- .../drivers_net_ethernet_atheros_atlx_atl1.patch | 8 ++--- .../drivers_net_ethernet_atheros_atlx_atl1.patch | 2 +- .../network/62-usb_driver_lpm.cocci | 9 +++++ .../drivers_bluetooth_ath3k.patch | 12 ------- .../drivers_bluetooth_bcm203x.patch | 12 ------- .../drivers_bluetooth_bfusb.patch | 12 ------- .../drivers_bluetooth_bpa10x.patch | 12 ------- .../drivers_bluetooth_btusb.patch | 12 ------- .../drivers_net_usb_cdc_ether.patch | 12 ------- .../drivers_net_usb_cdc_mbim.patch | 12 ------- .../drivers_net_usb_cdc_ncm.patch | 12 ------- .../drivers_net_usb_qmi_wwan.patch | 12 ------- .../drivers_net_usb_rndis_host.patch | 12 ------- .../drivers_net_usb_sierra_net.patch | 12 ------- .../drivers_net_wireless_at76c50x-usb.patch | 12 ------- .../drivers_net_wireless_ath_ath6kl_usb.patch | 12 ------- .../drivers_net_wireless_ath_ath9k_hif_usb.patch | 12 ------- .../drivers_net_wireless_ath_carl9170_usb.patch | 12 ------- ...ivers_net_wireless_brcm80211_brcmfmac_usb.patch | 12 ------- .../drivers_net_wireless_libertas_if_usb.patch | 12 ------- .../drivers_net_wireless_libertas_tf_if_usb.patch | 12 ------- .../drivers_net_wireless_orinoco_orinoco_usb.patch | 12 ------- .../drivers_net_wireless_p54_p54usb.patch | 12 ------- .../drivers_net_wireless_rndis_wlan.patch | 12 ------- .../drivers_net_wireless_rt2x00_rt2500usb.patch | 12 ------- .../drivers_net_wireless_rt2x00_rt2800usb.patch | 12 ------- .../drivers_net_wireless_rt2x00_rt73usb.patch | 12 ------- .../drivers_net_wireless_rtl818x_rtl8187_dev.patch | 12 ------- ...drivers_net_wireless_rtlwifi_rtl8192cu_sw.patch | 12 ------- .../drivers_net_wireless_zd1211rw_zd_usb.patch | 12 ------- .../drivers_usb_class_cdc-wdm.patch | 12 ------- 48 files changed, 60 insertions(+), 691 deletions(-) create mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops.cocci delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/INFO delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_bcma_host_pci.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atlx_atl1.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath5k_pci.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_p54_p54pci.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8188ee_sw.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192de_sw.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8723ae_sw.patch create mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm.cocci delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bcm203x.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bfusb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bpa10x.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_mbim.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ncm.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_qmi_wwan.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_rndis_host.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_sierra_net.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_at76c50x-usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath6kl_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_carl9170_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_brcm80211_brcmfmac_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_if_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_tf_if_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_orinoco_orinoco_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_p54_p54usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rndis_wlan.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2500usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2800usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt73usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtl818x_rtl8187_dev.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtlwifi_rtl8192cu_sw.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_zd1211rw_zd_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_usb_class_cdc-wdm.patch
Signature · 1 line
1.8.4.3
PATCH 1/3 backports: convert the 62-usb_driver_lpm patch series to SmPL
This is easily expressed instead as an SmPL patch for interpretation with Coccinelle. This replaces 336 lines patch code with 9 lines of SmPL.
--- .../collateral-evolutions/network/62-usb_driver_lpm.cocci | 9 +++++++++ .../network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch | 12 ------------ .../62-usb_driver_lpm/drivers_bluetooth_bcm203x.patch | 12 ------------ .../network/62-usb_driver_lpm/drivers_bluetooth_bfusb.patch | 12 ------------ .../network/62-usb_driver_lpm/drivers_bluetooth_bpa10x.patch | 12 ------------ .../network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch | 12 ------------ .../62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch | 12 ------------ .../network/62-usb_driver_lpm/drivers_net_usb_cdc_mbim.patch | 12 ------------ .../network/62-usb_driver_lpm/drivers_net_usb_cdc_ncm.patch | 12 ------------ .../network/62-usb_driver_lpm/drivers_net_usb_qmi_wwan.patch | 12 ------------ .../62-usb_driver_lpm/drivers_net_usb_rndis_host.patch | 12 ------------ .../62-usb_driver_lpm/drivers_net_usb_sierra_net.patch | 12 ------------ .../drivers_net_wireless_at76c50x-usb.patch | 12 ------------ .../drivers_net_wireless_ath_ath6kl_usb.patch | 12 ------------ .../drivers_net_wireless_ath_ath9k_hif_usb.patch | 12 ------------ .../drivers_net_wireless_ath_carl9170_usb.patch | 12 ------------ .../drivers_net_wireless_brcm80211_brcmfmac_usb.patch | 12 ------------ .../drivers_net_wireless_libertas_if_usb.patch | 12 ------------ .../drivers_net_wireless_libertas_tf_if_usb.patch | 12 ------------ .../drivers_net_wireless_orinoco_orinoco_usb.patch | 12 ------------ .../62-usb_driver_lpm/drivers_net_wireless_p54_p54usb.patch | 12 ------------ .../62-usb_driver_lpm/drivers_net_wireless_rndis_wlan.patch | 12 ------------ .../drivers_net_wireless_rt2x00_rt2500usb.patch | 12 ------------ .../drivers_net_wireless_rt2x00_rt2800usb.patch | 12 ------------ .../drivers_net_wireless_rt2x00_rt73usb.patch | 12 ------------ .../drivers_net_wireless_rtl818x_rtl8187_dev.patch | 12 ------------ .../drivers_net_wireless_rtlwifi_rtl8192cu_sw.patch | 12 ------------ .../drivers_net_wireless_zd1211rw_zd_usb.patch | 12 ------------ .../62-usb_driver_lpm/drivers_usb_class_cdc-wdm.patch | 12 ------------ 29 files changed, 9 insertions(+), 336 deletions(-) create mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm.cocci delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bcm203x.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bfusb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bpa10x.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_mbim.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ncm.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_qmi_wwan.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_rndis_host.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_sierra_net.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_at76c50x-usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath6kl_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_carl9170_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_brcm80211_brcmfmac_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_if_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_tf_if_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_orinoco_orinoco_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_p54_p54usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rndis_wlan.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2500usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2800usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt73usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtl818x_rtl8187_dev.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtlwifi_rtl8192cu_sw.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_zd1211rw_zd_usb.patch delete mode 100644 patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_usb_class_cdc-wdm.patch
patches/collateral-evolutions/network/62-usb_driver_lpm.cocci new file +9 -0
@@ -0,0 +1,9 @@ +@@ +identifier backport_driver; +@@ +struct usb_driver backport_driver = { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif +... +};
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/bluetooth/ath3k.c -+++ b/drivers/bluetooth/ath3k.c -@@ -507,7 +507,9 @@ static struct usb_driver ath3k_driver = - .probe = ath3k_probe, - .disconnect = ath3k_disconnect, - .id_table = ath3k_table, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(ath3k_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bcm203x.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/bluetooth/bcm203x.c -+++ b/drivers/bluetooth/bcm203x.c -@@ -273,7 +273,9 @@ static struct usb_driver bcm203x_driver - .probe = bcm203x_probe, - .disconnect = bcm203x_disconnect, - .id_table = bcm203x_table, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(bcm203x_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bfusb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/bluetooth/bfusb.c -+++ b/drivers/bluetooth/bfusb.c -@@ -730,7 +730,9 @@ static struct usb_driver bfusb_driver = - .probe = bfusb_probe, - .disconnect = bfusb_disconnect, - .id_table = bfusb_table, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(bfusb_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bpa10x.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/bluetooth/bpa10x.c -+++ b/drivers/bluetooth/bpa10x.c -@@ -503,7 +503,9 @@ static struct usb_driver bpa10x_driver = - .probe = bpa10x_probe, - .disconnect = bpa10x_disconnect, - .id_table = bpa10x_table, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(bpa10x_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -1637,7 +1637,9 @@ static struct usb_driver btusb_driver = - #endif - .id_table = btusb_table, - .supports_autosuspend = 1, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(btusb_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/usb/cdc_ether.c -+++ b/drivers/net/usb/cdc_ether.c -@@ -726,7 +726,9 @@ static struct usb_driver cdc_driver = { - .resume = usbnet_resume, - .reset_resume = usbnet_resume, - .supports_autosuspend = 1, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(cdc_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_mbim.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/usb/cdc_mbim.c -+++ b/drivers/net/usb/cdc_mbim.c -@@ -481,7 +481,9 @@ static struct usb_driver cdc_mbim_driver - .resume = cdc_mbim_resume, - .reset_resume = cdc_mbim_resume, - .supports_autosuspend = 1, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - module_usb_driver(cdc_mbim_driver); -
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ncm.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/usb/cdc_ncm.c -+++ b/drivers/net/usb/cdc_ncm.c -@@ -1212,7 +1212,9 @@ static struct usb_driver cdc_ncm_driver - .resume = usbnet_resume, - .reset_resume = usbnet_resume, - .supports_autosuspend = 1, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(cdc_ncm_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_qmi_wwan.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/usb/qmi_wwan.c -+++ b/drivers/net/usb/qmi_wwan.c -@@ -818,7 +818,9 @@ static struct usb_driver qmi_wwan_driver - .resume = qmi_wwan_resume, - .reset_resume = qmi_wwan_resume, - .supports_autosuspend = 1, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(qmi_wwan_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_rndis_host.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/usb/rndis_host.c -+++ b/drivers/net/usb/rndis_host.c -@@ -637,7 +637,9 @@ static struct usb_driver rndis_driver = - .disconnect = usbnet_disconnect, - .suspend = usbnet_suspend, - .resume = usbnet_resume, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(rndis_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_sierra_net.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/usb/sierra_net.c -+++ b/drivers/net/usb/sierra_net.c -@@ -959,7 +959,9 @@ static struct usb_driver sierra_net_driv - .suspend = usbnet_suspend, - .resume = usbnet_resume, - .no_dynamic_id = 1, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(sierra_net_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_at76c50x-usb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/at76c50x-usb.c -+++ b/drivers/net/wireless/at76c50x-usb.c -@@ -2451,7 +2451,9 @@ static struct usb_driver at76_driver = { - .probe = at76_probe, - .disconnect = at76_disconnect, - .id_table = dev_table, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - static int __init at76_mod_init(void)
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath6kl_usb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/ath/ath6kl/usb.c -+++ b/drivers/net/wireless/ath/ath6kl/usb.c -@@ -1225,7 +1225,9 @@ static struct usb_driver ath6kl_usb_driv - .disconnect = ath6kl_usb_remove, - .id_table = ath6kl_usb_ids, - .supports_autosuspend = true, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - static int ath6kl_usb_init(void)
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/hif_usb.c -+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -1368,7 +1368,9 @@ static struct usb_driver ath9k_hif_usb_d - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) - .soft_unbind = 1, - #endif -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - int ath9k_hif_usb_init(void)
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_carl9170_usb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/ath/carl9170/usb.c -+++ b/drivers/net/wireless/ath/carl9170/usb.c -@@ -1166,7 +1166,9 @@ static struct usb_driver carl9170_driver - .resume = carl9170_usb_resume, - .reset_resume = carl9170_usb_resume, - #endif /* CONFIG_PM */ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(carl9170_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_brcm80211_brcmfmac_usb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c -+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c -@@ -1502,7 +1502,9 @@ static struct usb_driver brcmf_usbdrvr = - .resume = brcmf_usb_resume, - .reset_resume = brcmf_usb_reset_resume, - .supports_autosuspend = 1, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - static void brcmf_release_fw(struct list_head *q)
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_if_usb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/libertas/if_usb.c -+++ b/drivers/net/wireless/libertas/if_usb.c -@@ -1010,7 +1010,9 @@ static struct usb_driver if_usb_driver = - .suspend = if_usb_suspend, - .resume = if_usb_resume, - .reset_resume = if_usb_resume, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(if_usb_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_tf_if_usb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/libertas_tf/if_usb.c -+++ b/drivers/net/wireless/libertas_tf/if_usb.c -@@ -920,7 +920,9 @@ static struct usb_driver if_usb_driver = - .id_table = if_usb_table, - .suspend = if_usb_suspend, - .resume = if_usb_resume, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(if_usb_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_orinoco_orinoco_usb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/orinoco/orinoco_usb.c -+++ b/drivers/net/wireless/orinoco/orinoco_usb.c -@@ -1759,7 +1759,9 @@ static struct usb_driver orinoco_driver - .probe = ezusb_probe, - .disconnect = ezusb_disconnect, - .id_table = ezusb_table, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(orinoco_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_p54_p54usb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/p54/p54usb.c -+++ b/drivers/net/wireless/p54/p54usb.c -@@ -1142,7 +1142,9 @@ static struct usb_driver p54u_driver = { - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) - .soft_unbind = 1, - #endif -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(p54u_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rndis_wlan.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/rndis_wlan.c -+++ b/drivers/net/wireless/rndis_wlan.c -@@ -3753,7 +3753,9 @@ static struct usb_driver rndis_wlan_driv - .disconnect = usbnet_disconnect, - .suspend = usbnet_suspend, - .resume = usbnet_resume, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(rndis_wlan_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2500usb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/rt2x00/rt2500usb.c -+++ b/drivers/net/wireless/rt2x00/rt2500usb.c -@@ -1998,7 +1998,9 @@ static struct usb_driver rt2500usb_drive - .suspend = rt2x00usb_suspend, - .resume = rt2x00usb_resume, - .reset_resume = rt2x00usb_resume, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(rt2500usb_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2800usb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/rt2x00/rt2800usb.c -+++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -1398,7 +1398,9 @@ static struct usb_driver rt2800usb_drive - .suspend = rt2x00usb_suspend, - .resume = rt2x00usb_resume, - .reset_resume = rt2x00usb_resume, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(rt2800usb_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt73usb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/rt2x00/rt73usb.c -+++ b/drivers/net/wireless/rt2x00/rt73usb.c -@@ -2548,7 +2548,9 @@ static struct usb_driver rt73usb_driver - .suspend = rt2x00usb_suspend, - .resume = rt2x00usb_resume, - .reset_resume = rt2x00usb_resume, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(rt73usb_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtl818x_rtl8187_dev.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/rtl818x/rtl8187/dev.c -+++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c -@@ -1678,7 +1678,9 @@ static struct usb_driver rtl8187_driver - .id_table = rtl8187_table, - .probe = rtl8187_probe, - .disconnect = rtl8187_disconnect, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(rtl8187_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtlwifi_rtl8192cu_sw.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c -+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c -@@ -397,7 +397,9 @@ static struct usb_driver rtl8192cu_drive - #ifdef CONFIG_AUTOSUSPEND - .supports_autosuspend = 1, - #endif -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(rtl8192cu_driver);
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_zd1211rw_zd_usb.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/zd1211rw/zd_usb.c -+++ b/drivers/net/wireless/zd1211rw/zd_usb.c -@@ -1540,7 +1540,9 @@ static struct usb_driver driver = { - .disconnect = disconnect, - .pre_reset = pre_reset, - .post_reset = post_reset, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - struct workqueue_struct *zd_workqueue;
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_usb_class_cdc-wdm.patch deleted +0 -12
@@ -1,12 +0,0 @@ ---- a/drivers/usb/class/cdc-wdm.c -+++ b/drivers/usb/class/cdc-wdm.c -@@ -1099,7 +1099,9 @@ static struct usb_driver wdm_driver = { - .post_reset = wdm_post_reset, - .id_table = wdm_ids, - .supports_autosuspend = 1, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) - .disable_hub_initiated_lpm = 1, -+#endif - }; - - module_usb_driver(wdm_driver);
Signature · 1 line
1.8.4.3
Re: [PATCH 1/3] backports: convert the 62-usb_driver_lpm patch series to SmPL
patches/collateral-evolutions/network/62-usb_driver_lpm.cocci line 4
Quoted 6 lines · Luis R. Rodriguez
+++
b/patches/collateral-evolutions/network/62-usb_driver_lpm.coccipatches/collateral-evolutions/network/62-usb_driver_lpm.cocci new file +4
-0@@ -0,0 +1,9 @@ +@@ +identifier backport_driver; +@@ +struct usb_driver backport_driver = {
You don't need "..." here?
patches/collateral-evolutions/network/62-usb_driver_lpm.cocci line 9
Quoted 5 lines
patches/collateral-evolutions/network/62-usb_driver_lpm.cocci new file +5
-0++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif +... +};
johannes
Re: [PATCH 1/3] backports: convert the 62-usb_driver_lpm patch series to SmPL
Quoted 10 lines · Johannes Berg
patches/collateral-evolutions/network/62-usb_driver_lpm.cocci line 4
Quoted 6 lines · Luis R. Rodriguez
+++
b/patches/collateral-evolutions/network/62-usb_driver_lpm.coccipatches/collateral-evolutions/network/62-usb_driver_lpm.cocci new file +4
-0@@ -0,0 +1,9 @@ +@@ +identifier backport_driver; +@@ +struct usb_driver backport_driver = {You don't need "..." here?
Not in this case, it works, adding it actually doesn't work right now as I wish.
Quoted 5 lines
patches/collateral-evolutions/network/62-usb_driver_lpm.cocci line 9
Quoted 5 lines
patches/collateral-evolutions/network/62-usb_driver_lpm.cocci new file +5
-0++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif +... +};
Luis
Re: [PATCH 1/3] backports: convert the 62-usb_driver_lpm patch series to SmPL
Quoted 12 lines · Luis R. Rodriguez
Quoted 10 lines · Johannes Berg
patches/collateral-evolutions/network/62-usb_driver_lpm.cocci line 4
Quoted 6 lines · Luis R. Rodriguez
+++
b/patches/collateral-evolutions/network/62-usb_driver_lpm.coccipatches/collateral-evolutions/network/62-usb_driver_lpm.cocci new file +4
-0@@ -0,0 +1,9 @@ +@@ +identifier backport_driver; +@@ +struct usb_driver backport_driver = {You don't need "..." here?
Quoted 1 line
Not in this case, it works, adding it actually doesn't work right now as I wish.
Structure initializers are a little bit special. The programmer can put them in any order and all of them are optional. So in a semantic patch, you can put only the ones that are relevant to the patch, in any order that you want. All of them have to appear, but others can appear as well.
The only time when you would want to put ... in this case is when you are adding a new field initializer (note that Luis's patch only adds decoration round an existing field initializer). In that case, if you put ..., before the added field initializer, the addition will be at the end, and if you put ..., after the field initializer, the addition will be at the beginning.
Note that this is completely different than the declaration of the structure type itself. In that case, the fields are ordered, so ... is needed.
julia
Quoted 9 lines
Quoted 6 lines
patches/collateral-evolutions/network/62-usb_driver_lpm.cocci line 9
Quoted 6 lines
patches/collateral-evolutions/network/62-usb_driver_lpm.cocci new file +5
-0++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif +... +};Luis
PATCH 2/3 backports: convert 11-dev-pm-ops patch series to SmPL
In reply to Luis R. RodriguezThe collateral evolution on pci power management ops can easily be expressed with SmPL, use that instead.
spatch version 1.0.0-rc19 with Python support and with PCRE support
mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py \ --verbose \ --clean \ --refresh \ /home/mcgrof/linux-next/ \ /home/mcgrof/build/next-20131206
real 8m6.077s user 7m46.076s sys 0m18.124s
There are three exceptions that this patch does not address:
libertas: this should be made a separate collateral evolution
specifically for spi drivers
iwlegacy: we'll deal with this as an evolution to our spatch,
it deals with having to rely on grammar rules which go beyond just one file.
mwifiex: coccinelle is not doing the transormation due to
an isomorphism on how pm suspend ops are declared, although we may be able to deal with this within Coccinelle to teach it this isomorphism we can also address this by streamlining how pm ops are defined upstream in the meantime.
--- .../network/11-dev-pm-ops.cocci | 42 ++++++++++++++++++++++ .../network/11-dev-pm-ops/INFO | 9 ----- .../11-dev-pm-ops/drivers_bcma_host_pci.patch | 25 ------------- .../drivers_net_ethernet_atheros_alx_main.patch | 25 ------------- ...ers_net_ethernet_atheros_atl1c_atl1c_main.patch | 25 ------------- .../drivers_net_ethernet_atheros_atlx_atl1.patch | 25 ------------- .../drivers_net_wireless_ath_ath5k_pci.patch | 25 ------------- .../drivers_net_wireless_ath_ath9k_pci.patch | 25 ------------- .../drivers_net_wireless_iwlegacy_common.patch | 8 ++--- .../drivers_net_wireless_iwlwifi_pcie_drv.patch | 25 ------------- .../drivers_net_wireless_mwifiex_pcie.patch | 12 +------ .../drivers_net_wireless_p54_p54pci.patch | 25 ------------- ...drivers_net_wireless_rtlwifi_rtl8188ee_sw.patch | 25 ------------- ...drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch | 25 ------------- ...drivers_net_wireless_rtlwifi_rtl8192de_sw.patch | 25 ------------- ...drivers_net_wireless_rtlwifi_rtl8192se_sw.patch | 25 ------------- ...drivers_net_wireless_rtlwifi_rtl8723ae_sw.patch | 25 ------------- 17 files changed, 46 insertions(+), 350 deletions(-) create mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops.cocci delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/INFO delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_bcma_host_pci.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atlx_atl1.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath5k_pci.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_p54_p54pci.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8188ee_sw.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192de_sw.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch delete mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8723ae_sw.patch
patches/collateral-evolutions/network/11-dev-pm-ops.cocci new file +42 -0
@@ -0,0 +1,42 @@ +// The 2.6.29 kernel has new struct dev_pm_ops [1] which are used +// on the pci device to distinguish power management hooks for suspend +// to RAM and hibernation. Older kernels don't have these so we need +// to resort back to the good ol' suspend/resume. Fortunately the calls +// are not so different so it should be possible to resuse the same +// calls on compat code with only slight modifications. +// +// [1] http://lxr.linux.no/#linux+v2.6.29/include/linux/pm.h#L170 + +@ module_pci @ +declarer name MODULE_DEVICE_TABLE; +identifier pci_ids; +@@ + +MODULE_DEVICE_TABLE(pci, pci_ids); + +@ simple_dev_pm depends on module_pci @ +identifier ops, pci_suspend, pci_resume; +declarer name SIMPLE_DEV_PM_OPS; +declarer name compat_pci_suspend; +declarer name compat_pci_resume; +@@ + ++compat_pci_suspend(pci_suspend); ++compat_pci_resume(pci_resume); +SIMPLE_DEV_PM_OPS(ops, pci_suspend, pci_resume); + +@@ +identifier backport_driver; +expression pm_ops; +fresh identifier backports_pci_suspend = simple_dev_pm.pci_suspend ## "_compat"; +fresh identifier backports_pci_resume = simple_dev_pm.pci_resume ## "_compat"; +@@ + +struct pci_driver backport_driver = { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = pm_ops, ++#elif defined(CONFIG_PM_SLEEP) ++ .suspend = backports_pci_suspend, ++ .resume = backports_pci_resume, ++#endif +};
patches/collateral-evolutions/network/11-dev-pm-ops/INFO deleted +0 -9
@@ -1,9 +0,0 @@ -The 2.6.29 kernel has new struct dev_pm_ops [1] which are used -on the pci device to distinguish power management hooks for suspend -to RAM and hibernation. Older kernels don't have these so we need -to resort back to the good ol' suspend/resume. Fortunately the calls -are not so different so it should be possible to resuse the same -calls on compat code with only slight modifications. - -[1] http://lxr.linux.no/#linux+v2.6.29/include/linux/pm.h#L170 -
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_bcma_host_pci.patch deleted +0 -25
@@ -1,25 +0,0 @@ ---- a/drivers/bcma/host_pci.c -+++ b/drivers/bcma/host_pci.c -@@ -259,6 +259,9 @@ static int bcma_host_pci_resume(struct d - return bcma_bus_resume(bus); - } - -+compat_pci_suspend(bcma_host_pci_suspend) -+compat_pci_resume(bcma_host_pci_resume) -+ - static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend, - bcma_host_pci_resume); - #define BCMA_PM_OPS (&bcma_pm_ops) -@@ -289,7 +292,12 @@ static struct pci_driver bcma_pci_bridge - .id_table = bcma_pci_bridge_tbl, - .probe = bcma_host_pci_probe, - .remove = bcma_host_pci_remove, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - .driver.pm = BCMA_PM_OPS, -+#elif defined(CONFIG_PM_SLEEP) -+ .suspend = bcma_host_pci_suspend_compat, -+ .resume = bcma_host_pci_resume_compat, -+#endif - }; - - int __init bcma_host_pci_init(void)
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch deleted +0 -25
@@ -1,25 +0,0 @@ ---- a/drivers/net/ethernet/atheros/alx/main.c -+++ b/drivers/net/ethernet/atheros/alx/main.c -@@ -1398,6 +1398,9 @@ static int alx_resume(struct device *dev - return __alx_open(alx, true); - } - -+compat_pci_suspend(alx_suspend); -+compat_pci_resume(alx_resume); -+ - static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume); - #define ALX_PM_OPS (&alx_pm_ops) - #else -@@ -1500,7 +1503,12 @@ static struct pci_driver alx_driver = { - .probe = alx_probe, - .remove = alx_remove, - .err_handler = &alx_err_handlers, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - .driver.pm = ALX_PM_OPS, -+#elif defined(CONFIG_PM_SLEEP) -+ .suspend = alx_suspend_compat, -+ .resume = alx_resume_compat, -+#endif - }; - - module_pci_driver(alx_driver);
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch deleted +0 -25
@@ -1,25 +0,0 @@ ---- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -2781,6 +2781,9 @@ static const struct pci_error_handlers a - .resume = atl1c_io_resume, - }; - -+compat_pci_suspend(atl1c_suspend) -+compat_pci_resume(atl1c_resume) -+ - static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume); - - static struct pci_driver atl1c_driver = { -@@ -2790,7 +2793,12 @@ static struct pci_driver atl1c_driver = - .remove = atl1c_remove, - .shutdown = atl1c_shutdown, - .err_handler = &atl1c_err_handler, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - .driver.pm = &atl1c_pm_ops, -+#elif defined(CONFIG_PM_SLEEP) -+ .suspend = atl1c_suspend_compat, -+ .resume = atl1c_resume_compat, -+#endif - }; - - module_pci_driver(atl1c_driver);
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atlx_atl1.patch deleted +0 -25
@@ -1,25 +0,0 @@ ---- a/drivers/net/ethernet/atheros/atlx/atl1.c -+++ b/drivers/net/ethernet/atheros/atlx/atl1.c -@@ -2878,6 +2878,9 @@ static int atl1_resume(struct device *de - } - #endif - -+compat_pci_suspend(atl1_suspend) -+compat_pci_resume(atl1_resume) -+ - static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume); - - static void atl1_shutdown(struct pci_dev *pdev) -@@ -3142,7 +3145,12 @@ static struct pci_driver atl1_driver = { - .probe = atl1_probe, - .remove = atl1_remove, - .shutdown = atl1_shutdown, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - .driver.pm = &atl1_pm_ops, -+#elif defined(CONFIG_PM_SLEEP) -+ .suspend = atl1_suspend_compat, -+ .resume = atl1_resume_compat, -+#endif - }; - - struct atl1_stats {
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath5k_pci.patch deleted +0 -25
@@ -1,25 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/pci.c -+++ b/drivers/net/wireless/ath/ath5k/pci.c -@@ -326,6 +326,9 @@ static int ath5k_pci_resume(struct devic - return 0; - } - -+compat_pci_suspend(ath5k_pci_suspend) -+compat_pci_resume(ath5k_pci_resume) -+ - static SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume); - #define ATH5K_PM_OPS (&ath5k_pm_ops) - #else -@@ -337,7 +340,12 @@ static struct pci_driver ath5k_pci_drive - .id_table = ath5k_pci_id_table, - .probe = ath5k_pci_probe, - .remove = ath5k_pci_remove, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - .driver.pm = ATH5K_PM_OPS, -+#elif defined(CONFIG_PM_SLEEP) -+ .suspend = ath5k_pci_suspend_compat, -+ .resume = ath5k_pci_resume_compat, -+#endif - }; - - module_pci_driver(ath5k_pci_driver);
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch deleted +0 -25
@@ -1,25 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/pci.c -+++ b/drivers/net/wireless/ath/ath9k/pci.c -@@ -883,6 +883,9 @@ static int ath_pci_resume(struct device - return 0; - } - -+compat_pci_suspend(ath_pci_suspend); -+compat_pci_resume(ath_pci_resume); -+ - static SIMPLE_DEV_PM_OPS(ath9k_pm_ops, ath_pci_suspend, ath_pci_resume); - - #define ATH9K_PM_OPS (&ath9k_pm_ops) -@@ -901,7 +904,12 @@ static struct pci_driver ath_pci_driver - .id_table = ath_pci_id_table, - .probe = ath_pci_probe, - .remove = ath_pci_remove, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - .driver.pm = ATH9K_PM_OPS, -+#elif defined(CONFIG_PM_SLEEP) -+ .suspend = ath_pci_suspend_compat, -+ .resume = ath_pci_resume_compat, -+#endif - }; - - int ath_pci_init(void)
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.patch +3 -5
@@ -1,14 +1,12 @@ --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c -@@ -4936,8 +4936,17 @@ il_pci_resume(struct device *device) +@@ -4936,8 +4936,15 @@ il_pci_resume(struct device *device) return 0; } -+compat_pci_suspend(il_pci_suspend) -+compat_pci_resume(il_pci_resume) -+ ++compat_pci_suspend(il_pci_suspend); ++compat_pci_resume(il_pci_resume); SIMPLE_DEV_PM_OPS(il_pm_ops, il_pci_suspend, il_pci_resume); -+ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) EXPORT_SYMBOL(il_pm_ops); +#else
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch deleted +0 -25
@@ -1,25 +0,0 @@ ---- a/drivers/net/wireless/iwlwifi/pcie/drv.c -+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c -@@ -467,6 +467,9 @@ static int iwl_pci_resume(struct device - return 0; - } - -+compat_pci_suspend(iwl_pci_suspend) -+compat_pci_resume(iwl_pci_resume) -+ - static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); - - #define IWL_PM_OPS (&iwl_dev_pm_ops) -@@ -482,7 +485,12 @@ static struct pci_driver iwl_pci_driver - .id_table = iwl_hw_card_ids, - .probe = iwl_pci_probe, - .remove = iwl_pci_remove, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - .driver.pm = IWL_PM_OPS, -+#elif defined(CONFIG_PM_SLEEP) -+ .suspend = iwl_pci_suspend_compat, -+ .resume = iwl_pci_resume_compat, -+#endif - }; - - int __must_check iwl_pci_register_driver(void)
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_mwifiex_pcie.patch +1 -11
@@ -1,16 +1,6 @@ --- a/drivers/net/wireless/mwifiex/pcie.c +++ b/drivers/net/wireless/mwifiex/pcie.c -@@ -259,6 +259,9 @@ static DEFINE_PCI_DEVICE_TABLE(mwifiex_i - MODULE_DEVICE_TABLE(pci, mwifiex_ids); - - #ifdef CONFIG_PM_SLEEP -+compat_pci_suspend(mwifiex_pcie_suspend); -+compat_pci_resume(mwifiex_pcie_resume); -+ - /* Power Management Hooks */ - static SIMPLE_DEV_PM_OPS(mwifiex_pcie_pm_ops, mwifiex_pcie_suspend, - mwifiex_pcie_resume); -@@ -271,9 +274,14 @@ static struct pci_driver __refdata mwifi +@@ -271,9 +271,14 @@ static struct pci_driver __refdata mwifi .probe = mwifiex_pcie_probe, .remove = mwifiex_pcie_remove, #ifdef CONFIG_PM_SLEEP
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_p54_p54pci.patch deleted +0 -25
@@ -1,25 +0,0 @@ ---- a/drivers/net/wireless/p54/p54pci.c -+++ b/drivers/net/wireless/p54/p54pci.c -@@ -683,6 +683,9 @@ static int p54p_resume(struct device *de - return pci_set_power_state(pdev, PCI_D0); - } - -+compat_pci_suspend(p54p_suspend); -+compat_pci_resume(p54p_resume); -+ - static SIMPLE_DEV_PM_OPS(p54pci_pm_ops, p54p_suspend, p54p_resume); - - #define P54P_PM_OPS (&p54pci_pm_ops) -@@ -695,7 +698,12 @@ static struct pci_driver p54p_driver = { - .id_table = p54p_table, - .probe = p54p_probe, - .remove = p54p_remove, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - .driver.pm = P54P_PM_OPS, -+#elif defined(CONFIG_PM_SLEEP) -+ .suspend = p54p_suspend_compat, -+ .resume = p54p_resume_compat, -+#endif - }; - - module_pci_driver(p54p_driver);
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8188ee_sw.patch deleted +0 -25
@@ -1,25 +0,0 @@ ---- a/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c -+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c -@@ -388,6 +388,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use - MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); - MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); - -+compat_pci_suspend(rtl_pci_suspend); -+compat_pci_resume(rtl_pci_resume); -+ - static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); - - static struct pci_driver rtl88ee_driver = { -@@ -395,7 +398,12 @@ static struct pci_driver rtl88ee_driver - .id_table = rtl88ee_pci_ids, - .probe = rtl_pci_probe, - .remove = rtl_pci_disconnect, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - .driver.pm = &rtlwifi_pm_ops, -+#elif defined(CONFIG_PM_SLEEP) -+ .suspend = rtl_pci_suspend_compat, -+ .resume = rtl_pci_resume_compat, -+#endif - }; - - module_pci_driver(rtl88ee_driver);
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch deleted +0 -25
@@ -1,25 +0,0 @@ ---- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c -+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c -@@ -375,6 +375,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use - MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); - MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); - -+compat_pci_suspend(rtl_pci_suspend); -+compat_pci_resume(rtl_pci_resume); -+ - static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); - - static struct pci_driver rtl92ce_driver = { -@@ -382,7 +385,12 @@ static struct pci_driver rtl92ce_driver - .id_table = rtl92ce_pci_ids, - .probe = rtl_pci_probe, - .remove = rtl_pci_disconnect, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - .driver.pm = &rtlwifi_pm_ops, -+#elif defined(CONFIG_PM_SLEEP) -+ .suspend = rtl_pci_suspend_compat, -+ .resume = rtl_pci_resume_compat, -+#endif - }; - - module_pci_driver(rtl92ce_driver);
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192de_sw.patch deleted +0 -25
@@ -1,25 +0,0 @@ ---- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c -+++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c -@@ -379,6 +379,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use - MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); - MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); - -+compat_pci_suspend(rtl_pci_suspend); -+compat_pci_resume(rtl_pci_resume); -+ - static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); - - static struct pci_driver rtl92de_driver = { -@@ -386,7 +389,12 @@ static struct pci_driver rtl92de_driver - .id_table = rtl92de_pci_ids, - .probe = rtl_pci_probe, - .remove = rtl_pci_disconnect, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - .driver.pm = &rtlwifi_pm_ops, -+#elif defined(CONFIG_PM_SLEEP) -+ .suspend = rtl_pci_suspend_compat, -+ .resume = rtl_pci_resume_compat, -+#endif - }; - - /* add global spin lock to solve the problem that
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch deleted +0 -25
@@ -1,25 +0,0 @@ ---- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c -+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c -@@ -430,6 +430,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use - MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); - MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); - -+compat_pci_suspend(rtl_pci_suspend); -+compat_pci_resume(rtl_pci_resume); -+ - static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); - - static struct pci_driver rtl92se_driver = { -@@ -437,7 +440,12 @@ static struct pci_driver rtl92se_driver - .id_table = rtl92se_pci_ids, - .probe = rtl_pci_probe, - .remove = rtl_pci_disconnect, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - .driver.pm = &rtlwifi_pm_ops, -+#elif defined(CONFIG_PM_SLEEP) -+ .suspend = rtl_pci_suspend_compat, -+ .resume = rtl_pci_resume_compat, -+#endif - }; - - module_pci_driver(rtl92se_driver);
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8723ae_sw.patch deleted +0 -25
@@ -1,25 +0,0 @@ ---- a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c -+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c -@@ -368,6 +368,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use - MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); - MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); - -+compat_pci_suspend(rtl_pci_suspend); -+compat_pci_resume(rtl_pci_resume); -+ - static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); - - static struct pci_driver rtl8723ae_driver = { -@@ -375,7 +378,12 @@ static struct pci_driver rtl8723ae_drive - .id_table = rtl8723ae_pci_ids, - .probe = rtl_pci_probe, - .remove = rtl_pci_disconnect, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - .driver.pm = &rtlwifi_pm_ops, -+#elif defined(CONFIG_PM_SLEEP) -+ .suspend = rtl_pci_suspend_compat, -+ .resume = rtl_pci_resume_compat, -+#endif - }; - - module_pci_driver(rtl8723ae_driver);
Signature · 1 line
1.8.4.3
PATCH 3/3 backports: refresh patches for next-20131206 a second time
In reply to Luis R. RodriguezAfter a few changes were made we need a refresh of patches against next-20131206, this refreshes the patches and test compiles against all supported kernels again.
$ time ckmake --allyesconfig 1 2.6.25 [ OK ] 2 2.6.26 [ OK ] 3 2.6.27 [ OK ] 4 2.6.28 [ OK ] 5 2.6.29 [ OK ] 6 2.6.30 [ OK ] 7 2.6.31 [ OK ] 8 2.6.32 [ OK ] 9 2.6.33 [ OK ] 10 2.6.34 [ OK ] 11 2.6.35 [ OK ] 12 2.6.36 [ OK ] 13 2.6.37 [ OK ] 14 2.6.38 [ OK ] 15 2.6.39 [ OK ] 16 3.0.101 [ OK ] 17 3.1.10 [ OK ] 18 3.2.52 [ OK ] 19 3.3.8 [ OK ] 20 3.4.70 [ OK ] 21 3.5.7 [ OK ] 22 3.6.11 [ OK ] 23 3.7.10 [ OK ] 24 3.8.13 [ OK ] 25 3.9.11 [ OK ] 26 3.10.20 [ OK ] 27 3.11.9 [ OK ] 28 3.12.1 [ OK ] 29 3.13-rc1 [ OK ]
real 33m3.982s user 892m21.988s sys 128m11.492s
Current run time *without* the last two cocci patches applied:
mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py \ --verbose \ --clean \ --refresh \ /home/mcgrof/linux-next/ \ /home/mcgrof/build/next-20131206
real 3m13.530s user 2m56.104s sys 0m16.180s
With the last two cocci patch files applied and spatch version 1.0.0-rc17:
mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py \ --verbose \ --clean \ --refresh \ /home/mcgrof/linux-next/ \ /home/mcgrof/build/next-20131206
real 23m2.521s user 19m19.436s sys 3m3.840s
With the last two cocci patch files applied and spatch version 1.0.0-rc19:
mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py \ --verbose \ --clean \ --refresh \ /home/mcgrof/linux-next/ \ /home/mcgrof/build/next-20131206
real 8m6.077s user 7m46.076s sys 0m18.124s
Moving forward please make sure to have present at least spatch 1.0.0-rc19 on your system to generate releases. The gains of extending how we do backports more automatically with Coccinelle for the short cost observed on 1.0.0-rc19 makes it worth it to continue to embrace SmPL to backport further collateral evolutions.
--- .../drivers_net_ethernet_atheros_atlx_atl1.patch | 8 ++++---- .../drivers_net_ethernet_atheros_atlx_atl1.patch | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl1.patch +4 -4
@@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c -@@ -2912,8 +2912,10 @@ static const struct net_device_ops atl1_ +@@ -2909,8 +2909,10 @@ static const struct net_device_ops atl1_ .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = atl1_set_mac, .ndo_change_mtu = atl1_change_mtu,
@@ -11,7 +11,7 @@ .ndo_do_ioctl = atlx_ioctl, .ndo_tx_timeout = atlx_tx_timeout, #ifdef CONFIG_NET_POLL_CONTROLLER -@@ -3023,11 +3025,13 @@ static int atl1_probe(struct pci_dev *pd +@@ -3020,11 +3022,13 @@ static int atl1_probe(struct pci_dev *pd netdev->features |= NETIF_F_SG; netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX);
@@ -25,7 +25,7 @@ /* * patch for some L1 of old version, -@@ -3615,6 +3619,14 @@ static int atl1_set_pauseparam(struct ne +@@ -3607,6 +3611,14 @@ static int atl1_set_pauseparam(struct ne return 0; }
@@ -40,7 +40,7 @@ static void atl1_get_strings(struct net_device *netdev, u32 stringset, u8 *data) { -@@ -3687,6 +3699,12 @@ static const struct ethtool_ops atl1_eth +@@ -3679,6 +3691,12 @@ static const struct ethtool_ops atl1_eth .nway_reset = atl1_nway_reset, .get_ethtool_stats = atl1_get_ethtool_stats, .get_sset_count = atl1_get_sset_count,
patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atlx_atl1.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c -@@ -3055,7 +3055,9 @@ static int atl1_probe(struct pci_dev *pd +@@ -3052,7 +3052,9 @@ static int atl1_probe(struct pci_dev *pd /* copy the MAC address out of the EEPROM */ if (atl1_read_mac_addr(&adapter->hw)) { /* mark random mac */
Signature · 1 line
1.8.4.3