Re: [PATCH] Use `grep -E` or plain `grep` instead of `egrep`

[Dhruva Gole]

On 01/01/23 22:11, Ville Skyttä wrote:

`egrep` has been deprecated in GNU grep since 2007,
and since 3.8 it emits obsolescence warnings:
https://git.savannah.gnu.org/cgit/grep.git/commit/?id=a9515624709865d480e3142fd959bccd1c9372d1
---


Acked-by: Dhruva Gole 


  arch/arm/mach-socfpga/qts-filter-a10.sh | 16 
  arch/arm/mach-socfpga/qts-filter.sh |  2 +-
  doc/board/intel/edison.rst  |  2 +-
  scripts/build-whitelist.sh  |  2 +-
  scripts/coccicheck  |  2 +-
  test/fs/fs-test.sh  | 10 +-
  6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/arch/arm/mach-socfpga/qts-filter-a10.sh 
b/arch/arm/mach-socfpga/qts-filter-a10.sh
index 57d77e8e12..ab16522add 100755
--- a/arch/arm/mach-socfpga/qts-filter-a10.sh
+++ b/arch/arm/mach-socfpga/qts-filter-a10.sh
@@ -10,7 +10,7 @@ fix_newlines_in_macros() {
  
  #filter out only what we need from a10 hps.xml

  grep_a10_hps_config() {
-   egrep "clk_hz|i_clk_mgr|i_io48_pin_mux|AXI_SLAVE|AXI_MASTER"
+   grep -E "clk_hz|i_clk_mgr|i_io48_pin_mux|AXI_SLAVE|AXI_MASTER"
  }
  
  #

@@ -35,35 +35,35 @@ EOF
  
  	echo "/* Clocks */"

fix_newlines_in_macros \
-   ${hps_xml} | egrep "clk_hz" |
+   ${hps_xml} | grep "clk_hz" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/\.[0-9]//' |
sed 's/I_CLK_MGR_//' |
sort
fix_newlines_in_macros \
-   ${hps_xml} | egrep "i_clk_mgr_mainpll" |
+   ${hps_xml} | grep "i_clk_mgr_mainpll" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/\.[0-9]//' |
sed 's/I_CLK_MGR_//' |
sort
fix_newlines_in_macros \
-   ${hps_xml} | egrep "i_clk_mgr_perpll" |
+   ${hps_xml} | grep "i_clk_mgr_perpll" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/\.[0-9]//' |
sed 's/I_CLK_MGR_//' |
sort
fix_newlines_in_macros \
-   ${hps_xml} | egrep "i_clk_mgr_clkmgr" |
+   ${hps_xml} | grep "i_clk_mgr_clkmgr" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/\.[0-9]//' |
sed 's/I_CLK_MGR_//' |
sort
fix_newlines_in_macros \
-   ${hps_xml} | egrep "i_clk_mgr_alteragrp" |
+   ${hps_xml} | grep "i_clk_mgr_alteragrp" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/\.[0-9]//' |
@@ -77,7 +77,7 @@ EOF
echo
echo "/* Pin Mux Configuration */"
fix_newlines_in_macros \
-   ${hps_xml} | egrep "i_io48_pin_mux" |
+   ${hps_xml} | grep "i_io48_pin_mux" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/I_IO48_PIN_MUX_//' |
@@ -90,7 +90,7 @@ EOF
echo
echo "/* Bridge Configuration */"
fix_newlines_in_macros \
-   ${hps_xml} | egrep "AXI_SLAVE|AXI_MASTER" |
+   ${hps_xml} | grep -E "AXI_SLAVE|AXI_MASTER" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/true/1/' |
diff --git a/arch/arm/mach-socfpga/qts-filter.sh 
b/arch/arm/mach-socfpga/qts-filter.sh
index 6416252d4e..1610c89a48 100755
--- a/arch/arm/mach-socfpga/qts-filter.sh
+++ b/arch/arm/mach-socfpga/qts-filter.sh
@@ -128,7 +128,7 @@ EOF
  # Filter out only the macros which are actually used by the code
  #
  grep_sdram_config() {
-   egrep "#define 

[PATCH] Use `grep -E` or plain `grep` instead of `egrep`

[Ville Skyttä]

`egrep` has been deprecated in GNU grep since 2007,
and since 3.8 it emits obsolescence warnings:
https://git.savannah.gnu.org/cgit/grep.git/commit/?id=a9515624709865d480e3142fd959bccd1c9372d1
---
 arch/arm/mach-socfpga/qts-filter-a10.sh | 16 
 arch/arm/mach-socfpga/qts-filter.sh |  2 +-
 doc/board/intel/edison.rst  |  2 +-
 scripts/build-whitelist.sh  |  2 +-
 scripts/coccicheck  |  2 +-
 test/fs/fs-test.sh  | 10 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/arch/arm/mach-socfpga/qts-filter-a10.sh 
b/arch/arm/mach-socfpga/qts-filter-a10.sh
index 57d77e8e12..ab16522add 100755
--- a/arch/arm/mach-socfpga/qts-filter-a10.sh
+++ b/arch/arm/mach-socfpga/qts-filter-a10.sh
@@ -10,7 +10,7 @@ fix_newlines_in_macros() {
 
 #filter out only what we need from a10 hps.xml
 grep_a10_hps_config() {
-   egrep "clk_hz|i_clk_mgr|i_io48_pin_mux|AXI_SLAVE|AXI_MASTER"
+   grep -E "clk_hz|i_clk_mgr|i_io48_pin_mux|AXI_SLAVE|AXI_MASTER"
 }
 
 #
@@ -35,35 +35,35 @@ EOF
 
echo "/* Clocks */"
fix_newlines_in_macros \
-   ${hps_xml} | egrep "clk_hz" |
+   ${hps_xml} | grep "clk_hz" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/\.[0-9]//' |
sed 's/I_CLK_MGR_//' |
sort
fix_newlines_in_macros \
-   ${hps_xml} | egrep "i_clk_mgr_mainpll" |
+   ${hps_xml} | grep "i_clk_mgr_mainpll" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/\.[0-9]//' |
sed 's/I_CLK_MGR_//' |
sort
fix_newlines_in_macros \
-   ${hps_xml} | egrep "i_clk_mgr_perpll" |
+   ${hps_xml} | grep "i_clk_mgr_perpll" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/\.[0-9]//' |
sed 's/I_CLK_MGR_//' |
sort
fix_newlines_in_macros \
-   ${hps_xml} | egrep "i_clk_mgr_clkmgr" |
+   ${hps_xml} | grep "i_clk_mgr_clkmgr" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/\.[0-9]//' |
sed 's/I_CLK_MGR_//' |
sort
fix_newlines_in_macros \
-   ${hps_xml} | egrep "i_clk_mgr_alteragrp" |
+   ${hps_xml} | grep "i_clk_mgr_alteragrp" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/\.[0-9]//' |
@@ -77,7 +77,7 @@ EOF
echo
echo "/* Pin Mux Configuration */"
fix_newlines_in_macros \
-   ${hps_xml} | egrep "i_io48_pin_mux" |
+   ${hps_xml} | grep "i_io48_pin_mux" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/I_IO48_PIN_MUX_//' |
@@ -90,7 +90,7 @@ EOF
echo
echo "/* Bridge Configuration */"
fix_newlines_in_macros \
-   ${hps_xml} | egrep "AXI_SLAVE|AXI_MASTER" |
+   ${hps_xml} | grep -E "AXI_SLAVE|AXI_MASTER" |
awk -F"'" '{ gsub("\\.","_",$2) ; \
print "#define" " " toupper($2) " " $4}' |
sed 's/true/1/' |
diff --git a/arch/arm/mach-socfpga/qts-filter.sh 
b/arch/arm/mach-socfpga/qts-filter.sh
index 6416252d4e..1610c89a48 100755
--- a/arch/arm/mach-socfpga/qts-filter.sh
+++ b/arch/arm/mach-socfpga/qts-filter.sh
@@ -128,7 +128,7 @@ EOF
 # Filter out only the macros which are actually used by the code
 #
 grep_sdram_config() {
-   egrep "#define 

Re: [PATCH] i2c: uniphier-f: correct error recovery

[Tom Rini]

On Sun, Jan 01, 2023 at 08:45:44AM +0100, Heiko Schocher wrote:
> Hello Dai Okamura,
> 
> On 09.12.22 12:38, Dai Okamura wrote:
> > The uniphier i2c block can recognize some handshake errors.
> > But driver handles all error detections as no error if no timeout.
> > So this makes unrecoverable state.
> > 
> > This replaces the return values with the right ones to tell the i2c
> > framework the errors:
> > - EDEADLK for arbitration lost error
> > - ENODATA for no answer error
> > 
> > Signed-off-by: Dai Okamura 
> > ---
> >  drivers/i2c/i2c-uniphier-f.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Reviewed-by: Heiko Schocher 
> 
> @Tom: Is it okay for you, to add this patch to 2023.01 release?
>   If yes, do you want to pick it up, or should I send a pull
>   request?

I'll pick it up, thanks!

-- 
Tom


signature.asc
Description: PGP signature