[PATCH v2] pci: Rename pci_xbox_blacklisted() as pci_xbox_skip_device()

[Philippe Mathieu-Daudé]

In order to use inclusive terminology, rename pci_xbox_blacklisted()
as pci_xbox_skip_device(), and remove an obvious comment.

Suggested-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Signed-off-by: Philippe Mathieu-Daudé <philmd(a)redhat.com>
---
 drivers/pci.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/pci.c b/drivers/pci.c
index 34ae69a..461e0fe 100644
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -1356,7 +1356,7 @@ static void ob_pci_add_properties(phandle_t phandle,
 }
 
 #ifdef CONFIG_XBOX
-static char pci_xbox_blacklisted (int bus, int devnum, int fn)
+static char pci_xbox_skip_device (int bus, int devnum, int fn)
 {
 	/*
 	 * The Xbox MCPX chipset is a derivative of the nForce 1
@@ -1387,9 +1387,6 @@ static char pci_xbox_blacklisted (int bus, int devnum, int fn)
 	if (bus >= 2)
 		return 1;
 
-	/*
-	 * The device is not blacklisted.
-	 */
 	return 0;
 }
 #endif
@@ -1708,7 +1705,7 @@ static int ob_pci_read_identification(int bus, int devnum, int fn,
     pci_addr addr;
 
 #ifdef CONFIG_XBOX
-    if (pci_xbox_blacklisted (bus, devnum, fn))
+    if (pci_xbox_skip_device (bus, devnum, fn))
         return;
 #endif
     addr = PCI_ADDR(bus, devnum, fn);
-- 
2.26.2

[Philippe Mathieu-Daudé]

On 2/10/21 1:16 PM, Mark Cave-Ayland wrote:
  On 08/02/2021 14:01, Philippe Mathieu-Daudé wrote:
 
  In order to use inclusive terminology, rename
pci_xbox_blacklisted()
 as pci_xbox_skip_device(), and remove an obvious comment.

 Suggested-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
 Signed-off-by: Philippe Mathieu-Daudé <philmd(a)redhat.com>
 ---
   drivers/pci.c | 7 ++-----
   1 file changed, 2 insertions(+), 5 deletions(-)

 diff --git a/drivers/pci.c b/drivers/pci.c
 index 34ae69a..461e0fe 100644
 --- a/drivers/pci.c
 +++ b/drivers/pci.c
 @@ -1356,7 +1356,7 @@ static void ob_pci_add_properties(phandle_t
 phandle,
   }
     #ifdef CONFIG_XBOX
 -static char pci_xbox_blacklisted (int bus, int devnum, int fn)
 +static char pci_xbox_skip_device (int bus, int devnum, int fn)
   {
       /*
        * The Xbox MCPX chipset is a derivative of the nForce 1
 @@ -1387,9 +1387,6 @@ static char pci_xbox_blacklisted (int bus, int
 devnum, int fn)
       if (bus >= 2)
           return 1;
   -    /*
 -     * The device is not blacklisted.
 -     */
       return 0;
   }
   #endif
 @@ -1708,7 +1705,7 @@ static int ob_pci_read_identification(int bus,
 int devnum, int fn,
       pci_addr addr;
     #ifdef CONFIG_XBOX
 -    if (pci_xbox_blacklisted (bus, devnum, fn))
 +    if (pci_xbox_skip_device (bus, devnum, fn))
           return;
   #endif
       addr = PCI_ADDR(bus, devnum, fn);
 
 Actually looking at this again I think pci_xbox_ignore_device() is
 better still. It's simple enough for me to fix this up when applying if
 you don't want to post a v3?
Oops I did the requested change but forgot to repost...

[Mark Cave-Ayland]

On 08/02/2021 14:01, Philippe Mathieu-Daudé wrote:

  In order to use inclusive terminology, rename
pci_xbox_blacklisted()
 as pci_xbox_skip_device(), and remove an obvious comment.
 
 Suggested-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
 Signed-off-by: Philippe Mathieu-Daudé <philmd(a)redhat.com>
 ---
   drivers/pci.c | 7 ++-----
   1 file changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/pci.c b/drivers/pci.c
 index 34ae69a..461e0fe 100644
 --- a/drivers/pci.c
 +++ b/drivers/pci.c
 @@ -1356,7 +1356,7 @@ static void ob_pci_add_properties(phandle_t phandle,
   }
   
   #ifdef CONFIG_XBOX
 -static char pci_xbox_blacklisted (int bus, int devnum, int fn)
 +static char pci_xbox_skip_device (int bus, int devnum, int fn)
   {
   	/*
   	 * The Xbox MCPX chipset is a derivative of the nForce 1
 @@ -1387,9 +1387,6 @@ static char pci_xbox_blacklisted (int bus, int devnum, int fn)
   	if (bus >= 2)
   		return 1;
   
 -	/*
 -	 * The device is not blacklisted.
 -	 */
   	return 0;
   }
   #endif
 @@ -1708,7 +1705,7 @@ static int ob_pci_read_identification(int bus, int devnum, int fn,
       pci_addr addr;
   
   #ifdef CONFIG_XBOX
 -    if (pci_xbox_blacklisted (bus, devnum, fn))
 +    if (pci_xbox_skip_device (bus, devnum, fn))
           return;
   #endif
       addr = PCI_ADDR(bus, devnum, fn);
Actually looking at this again I think pci_xbox_ignore_device() is better still. It's

simple enough for me to fix this up when applying if you don't want to post a v3?


ATB,

Mark.