diff for duplicates of <55FB3720.6010805@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 45e62bc..8b13789 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1 @@ -A non-text attachment was scrubbed... -Name: e1000_hw_c_Remove_checkpatch_coding_style_errors.patch -Type: text/x-patch -Size: 3024 bytes -Desc: not available -URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20150917/2d4eefd4/attachment.bin> + diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..d7da07f --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,5 @@ +Content-Type: text/x-patch; + name="e1000_hw_c_Remove_checkpatch_coding_style_errors.patch" +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment; + filename="e1000_hw_c_Remove_checkpatch_coding_style_errors.patch" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..d4701e1 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,81 @@ +>From 4ac9fd87e092f58eb7a6ed898360dfd83c5c10f5 Mon Sep 17 00:00:00 2001 +From: Janusz Wolak <januszvdm@gmail.com> +Date: Thu, 17 Sep 2015 23:34:29 +0200 +Subject: [PATCH] Remove checkpatch coding style errors. + +Signed-off-by: Janusz Wolak <januszvdm@gmail.com> +--- + drivers/net/ethernet/intel/e1000/e1000_hw.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c +index 45c8c864..cc1fe40 100644 +--- a/drivers/net/ethernet/intel/e1000/e1000_hw.c ++++ b/drivers/net/ethernet/intel/e1000/e1000_hw.c +@@ -683,7 +683,7 @@ static s32 e1000_adjust_serdes_amplitude(struct e1000_hw *hw) + } + + ret_val = e1000_read_eeprom(hw, EEPROM_SERDES_AMPLITUDE, 1, +- &eeprom_data); ++ &eeprom_data); + if (ret_val) { + return ret_val; + } +@@ -1652,7 +1652,7 @@ s32 e1000_phy_setup_autoneg(struct e1000_hw *hw) + mii_1000t_ctrl_reg = 0; + } else { + ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL, +- mii_1000t_ctrl_reg); ++ mii_1000t_ctrl_reg); + if (ret_val) + return ret_val; + } +@@ -2193,8 +2193,7 @@ static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw) + else if (!(mii_nway_adv_reg & NWAY_AR_PAUSE) && + (mii_nway_adv_reg & NWAY_AR_ASM_DIR) && + (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) && +- (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) +- { ++ (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) { + hw->fc = E1000_FC_TX_PAUSE; + e_dbg + ("Flow Control = TX PAUSE frames only.\n"); +@@ -2210,8 +2209,7 @@ static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw) + else if ((mii_nway_adv_reg & NWAY_AR_PAUSE) && + (mii_nway_adv_reg & NWAY_AR_ASM_DIR) && + !(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) && +- (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) +- { ++ (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) { + hw->fc = E1000_FC_RX_PAUSE; + e_dbg + ("Flow Control = RX PAUSE frames only.\n"); +@@ -3449,7 +3447,7 @@ s32 e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info) + if (hw->phy_type == e1000_phy_igp) + return e1000_phy_igp_get_info(hw, phy_info); + else if ((hw->phy_type == e1000_phy_8211) || +- (hw->phy_type == e1000_phy_8201)) ++ (hw->phy_type == e1000_phy_8201)) + return E1000_SUCCESS; + else + return e1000_phy_m88_get_info(hw, phy_info); +@@ -3896,7 +3894,7 @@ static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, + + if (hw->mac_type == e1000_ce4100) { + GBE_CONFIG_FLASH_READ(GBE_CONFIG_BASE_VIRT, offset, words, +- data); ++ data); + return E1000_SUCCESS; + } + +@@ -4070,7 +4068,7 @@ static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, + + if (hw->mac_type == e1000_ce4100) { + GBE_CONFIG_FLASH_WRITE(GBE_CONFIG_BASE_VIRT, offset, words, +- data); ++ data); + return E1000_SUCCESS; + } + +-- +1.9.1 diff --git a/a/content_digest b/N1/content_digest index 7d00e28..6ceaeaf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,93 @@ "From\0Janusz Wolak <januszvdm@gmail.com>\0" - "Subject\0[Intel-wired-lan] e1000_hw_c_checkpatch_coding_style_errors_remove\0" + "Subject\0e1000_hw_c_checkpatch_coding_style_errors_remove\0" "Date\0Thu, 17 Sep 2015 23:56:48 +0200\0" - "To\0intel-wired-lan@osuosl.org\0" - "\00:1\0" + "To\0intel-wired-lan@lists.osuosl.org" + " netdev@vger.kernel.org\0" + "\01:1\0" "b\0" - "A non-text attachment was scrubbed...\n" - "Name: e1000_hw_c_Remove_checkpatch_coding_style_errors.patch\n" - "Type: text/x-patch\n" - "Size: 3024 bytes\n" - "Desc: not available\n" - URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20150917/2d4eefd4/attachment.bin> + "\01:2\0" + "fn\0e1000_hw_c_Remove_checkpatch_coding_style_errors.patch\0" + "b\0" + ">From 4ac9fd87e092f58eb7a6ed898360dfd83c5c10f5 Mon Sep 17 00:00:00 2001\n" + "From: Janusz Wolak <januszvdm@gmail.com>\n" + "Date: Thu, 17 Sep 2015 23:34:29 +0200\n" + "Subject: [PATCH] Remove checkpatch coding style errors.\n" + "\n" + "Signed-off-by: Janusz Wolak <januszvdm@gmail.com>\n" + "---\n" + " drivers/net/ethernet/intel/e1000/e1000_hw.c | 16 +++++++---------\n" + " 1 file changed, 7 insertions(+), 9 deletions(-)\n" + "\n" + "diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c\n" + "index 45c8c864..cc1fe40 100644\n" + "--- a/drivers/net/ethernet/intel/e1000/e1000_hw.c\n" + "+++ b/drivers/net/ethernet/intel/e1000/e1000_hw.c\n" + "@@ -683,7 +683,7 @@ static s32 e1000_adjust_serdes_amplitude(struct e1000_hw *hw)\n" + " \t}\n" + " \n" + " \tret_val = e1000_read_eeprom(hw, EEPROM_SERDES_AMPLITUDE, 1,\n" + "-\t &eeprom_data);\n" + "+\t\t\t\t &eeprom_data);\n" + " \tif (ret_val) {\n" + " \t\treturn ret_val;\n" + " \t}\n" + "@@ -1652,7 +1652,7 @@ s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)\n" + " \t\tmii_1000t_ctrl_reg = 0;\n" + " \t} else {\n" + " \t\tret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL,\n" + "-\t\t mii_1000t_ctrl_reg);\n" + "+\t\t\t\t\t mii_1000t_ctrl_reg);\n" + " \t\tif (ret_val)\n" + " \t\t\treturn ret_val;\n" + " \t}\n" + "@@ -2193,8 +2193,7 @@ static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw)\n" + " \t\t\telse if (!(mii_nway_adv_reg & NWAY_AR_PAUSE) &&\n" + " \t\t\t\t (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&\n" + " \t\t\t\t (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&\n" + "-\t\t\t\t (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR))\n" + "-\t\t\t{\n" + "+\t\t\t\t (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {\n" + " \t\t\t\thw->fc = E1000_FC_TX_PAUSE;\n" + " \t\t\t\te_dbg\n" + " \t\t\t\t (\"Flow Control = TX PAUSE frames only.\\n\");\n" + "@@ -2210,8 +2209,7 @@ static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw)\n" + " \t\t\telse if ((mii_nway_adv_reg & NWAY_AR_PAUSE) &&\n" + " \t\t\t\t (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&\n" + " \t\t\t\t !(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&\n" + "-\t\t\t\t (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR))\n" + "-\t\t\t{\n" + "+\t\t\t\t (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {\n" + " \t\t\t\thw->fc = E1000_FC_RX_PAUSE;\n" + " \t\t\t\te_dbg\n" + " \t\t\t\t (\"Flow Control = RX PAUSE frames only.\\n\");\n" + "@@ -3449,7 +3447,7 @@ s32 e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info)\n" + " \tif (hw->phy_type == e1000_phy_igp)\n" + " \t\treturn e1000_phy_igp_get_info(hw, phy_info);\n" + " \telse if ((hw->phy_type == e1000_phy_8211) ||\n" + "-\t (hw->phy_type == e1000_phy_8201))\n" + "+\t\t (hw->phy_type == e1000_phy_8201))\n" + " \t\treturn E1000_SUCCESS;\n" + " \telse\n" + " \t\treturn e1000_phy_m88_get_info(hw, phy_info);\n" + "@@ -3896,7 +3894,7 @@ static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words,\n" + " \n" + " \tif (hw->mac_type == e1000_ce4100) {\n" + " \t\tGBE_CONFIG_FLASH_READ(GBE_CONFIG_BASE_VIRT, offset, words,\n" + "-\t\t data);\n" + "+\t\t\t\t data);\n" + " \t\treturn E1000_SUCCESS;\n" + " \t}\n" + " \n" + "@@ -4070,7 +4068,7 @@ static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words,\n" + " \n" + " \tif (hw->mac_type == e1000_ce4100) {\n" + " \t\tGBE_CONFIG_FLASH_WRITE(GBE_CONFIG_BASE_VIRT, offset, words,\n" + "-\t\t data);\n" + "+\t\t\t\t data);\n" + " \t\treturn E1000_SUCCESS;\n" + " \t}\n" + " \n" + "-- \n" + 1.9.1 -b80287827a31378e3b62581b5660d6c54b63d881f93d1074fd21753731be885b +b5a8d6eab355400c558d0674b293c5e4efa87bda37d3ad4b4001c1aa3aa33898
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.