* [RFC PATCH 16/35] hwmon: (sis5595) Change PCIBIOS_SUCCESSFUL to 0
[not found] <20200713122247.10985-1-refactormyself@gmail.com>
@ 2020-07-13 12:22 ` Saheed O. Bolarinwa
2020-07-14 5:02 ` Guenter Roeck
2020-07-13 12:22 ` [RFC PATCH 17/35] hwmon: (sis5595) Tidy Success/Failure checks Saheed O. Bolarinwa
1 sibling, 1 reply; 4+ messages in thread
From: Saheed O. Bolarinwa @ 2020-07-13 12:22 UTC (permalink / raw)
To: helgaas, Jean Delvare, Guenter Roeck
Cc: Saheed O. Bolarinwa, bjorn, skhan, linux-pci,
linux-kernel-mentees, linux-kernel, linux-hwmon
In reference to the PCI spec (Chapter 2), PCIBIOS* is an x86 concept.
Their scope should be limited within arch/x86.
Change all PCIBIOS_SUCCESSFUL to 0
Signed-off-by: "Saheed O. Bolarinwa" <refactormyself@gmail.com>
---
drivers/hwmon/sis5595.c | 8 ++++----
drivers/hwmon/via686a.c | 8 ++++----
drivers/hwmon/vt8231.c | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 0c6741f949f5..0ea174fb3048 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -825,7 +825,7 @@ static int sis5595_pci_probe(struct pci_dev *dev,
pci_write_config_word(dev, SIS5595_BASE_REG, force_addr);
}
- if (PCIBIOS_SUCCESSFUL !=
+ if (0 !=
pci_read_config_word(dev, SIS5595_BASE_REG, &address)) {
dev_err(&dev->dev, "Failed to read ISA address\n");
return -ENODEV;
@@ -843,16 +843,16 @@ static int sis5595_pci_probe(struct pci_dev *dev,
return -ENODEV;
}
- if (PCIBIOS_SUCCESSFUL !=
+ if (0 !=
pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable)) {
dev_err(&dev->dev, "Failed to read enable register\n");
return -ENODEV;
}
if (!(enable & 0x80)) {
- if ((PCIBIOS_SUCCESSFUL !=
+ if ((0 !=
pci_write_config_byte(dev, SIS5595_ENABLE_REG,
enable | 0x80))
- || (PCIBIOS_SUCCESSFUL !=
+ || (0 !=
pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable))
|| (!(enable & 0x80))) {
/* doesn't work for some chips! */
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index a2eddd2c2538..cffea688878f 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -863,11 +863,11 @@ static int via686a_pci_probe(struct pci_dev *dev,
if (force_addr) {
address = force_addr & ~(VIA686A_EXTENT - 1);
dev_warn(&dev->dev, "Forcing ISA address 0x%x\n", address);
- if (PCIBIOS_SUCCESSFUL !=
+ if (0 !=
pci_write_config_word(dev, VIA686A_BASE_REG, address | 1))
return -ENODEV;
}
- if (PCIBIOS_SUCCESSFUL !=
+ if (0 !=
pci_read_config_word(dev, VIA686A_BASE_REG, &val))
return -ENODEV;
@@ -878,7 +878,7 @@ static int via686a_pci_probe(struct pci_dev *dev,
return -ENODEV;
}
- if (PCIBIOS_SUCCESSFUL !=
+ if (0 !=
pci_read_config_word(dev, VIA686A_ENABLE_REG, &val))
return -ENODEV;
if (!(val & 0x0001)) {
@@ -890,7 +890,7 @@ static int via686a_pci_probe(struct pci_dev *dev,
}
dev_warn(&dev->dev, "Enabling sensors\n");
- if (PCIBIOS_SUCCESSFUL !=
+ if (0 !=
pci_write_config_word(dev, VIA686A_ENABLE_REG,
val | 0x0001))
return -ENODEV;
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index 2335d440f72d..cc1d24c2a2c8 100644
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -987,12 +987,12 @@ static int vt8231_pci_probe(struct pci_dev *dev,
dev_warn(&dev->dev, "Forcing ISA address 0x%x\n",
address);
- if (PCIBIOS_SUCCESSFUL !=
+ if (0 !=
pci_write_config_word(dev, VT8231_BASE_REG, address | 1))
return -ENODEV;
}
- if (PCIBIOS_SUCCESSFUL != pci_read_config_word(dev, VT8231_BASE_REG,
+ if (0 != pci_read_config_word(dev, VT8231_BASE_REG,
&val))
return -ENODEV;
@@ -1002,13 +1002,13 @@ static int vt8231_pci_probe(struct pci_dev *dev,
return -ENODEV;
}
- if (PCIBIOS_SUCCESSFUL != pci_read_config_word(dev, VT8231_ENABLE_REG,
+ if (0 != pci_read_config_word(dev, VT8231_ENABLE_REG,
&val))
return -ENODEV;
if (!(val & 0x0001)) {
dev_warn(&dev->dev, "enabling sensors\n");
- if (PCIBIOS_SUCCESSFUL !=
+ if (0 !=
pci_write_config_word(dev, VT8231_ENABLE_REG,
val | 0x0001))
return -ENODEV;
--
2.18.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [RFC PATCH 17/35] hwmon: (sis5595) Tidy Success/Failure checks
[not found] <20200713122247.10985-1-refactormyself@gmail.com>
2020-07-13 12:22 ` [RFC PATCH 16/35] hwmon: (sis5595) Change PCIBIOS_SUCCESSFUL to 0 Saheed O. Bolarinwa
@ 2020-07-13 12:22 ` Saheed O. Bolarinwa
2020-07-14 5:04 ` Guenter Roeck
1 sibling, 1 reply; 4+ messages in thread
From: Saheed O. Bolarinwa @ 2020-07-13 12:22 UTC (permalink / raw)
To: helgaas, Jean Delvare, Guenter Roeck
Cc: Saheed O. Bolarinwa, bjorn, skhan, linux-pci,
linux-kernel-mentees, linux-kernel, linux-hwmon
Remove unnecessary check for 0.
Signed-off-by: "Saheed O. Bolarinwa" <refactormyself@gmail.com>
---
This patch depends on PATCH 16/35
drivers/hwmon/sis5595.c | 13 ++++---------
drivers/hwmon/via686a.c | 13 ++++---------
drivers/hwmon/vt8231.c | 13 ++++---------
3 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 0ea174fb3048..91fdddaa4136 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -825,8 +825,7 @@ static int sis5595_pci_probe(struct pci_dev *dev,
pci_write_config_word(dev, SIS5595_BASE_REG, force_addr);
}
- if (0 !=
- pci_read_config_word(dev, SIS5595_BASE_REG, &address)) {
+ if (pci_read_config_word(dev, SIS5595_BASE_REG, &address)) {
dev_err(&dev->dev, "Failed to read ISA address\n");
return -ENODEV;
}
@@ -843,17 +842,13 @@ static int sis5595_pci_probe(struct pci_dev *dev,
return -ENODEV;
}
- if (0 !=
- pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable)) {
+ if (pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable)) {
dev_err(&dev->dev, "Failed to read enable register\n");
return -ENODEV;
}
if (!(enable & 0x80)) {
- if ((0 !=
- pci_write_config_byte(dev, SIS5595_ENABLE_REG,
- enable | 0x80))
- || (0 !=
- pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable))
+ if ((pci_write_config_byte(dev, SIS5595_ENABLE_REG, enable | 0x80))
+ || (pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable))
|| (!(enable & 0x80))) {
/* doesn't work for some chips! */
dev_err(&dev->dev, "Failed to enable HWM device\n");
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index cffea688878f..b8466e2e1435 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -863,12 +863,10 @@ static int via686a_pci_probe(struct pci_dev *dev,
if (force_addr) {
address = force_addr & ~(VIA686A_EXTENT - 1);
dev_warn(&dev->dev, "Forcing ISA address 0x%x\n", address);
- if (0 !=
- pci_write_config_word(dev, VIA686A_BASE_REG, address | 1))
+ if (pci_write_config_word(dev, VIA686A_BASE_REG, address | 1))
return -ENODEV;
}
- if (0 !=
- pci_read_config_word(dev, VIA686A_BASE_REG, &val))
+ if (pci_read_config_word(dev, VIA686A_BASE_REG, &val))
return -ENODEV;
address = val & ~(VIA686A_EXTENT - 1);
@@ -878,8 +876,7 @@ static int via686a_pci_probe(struct pci_dev *dev,
return -ENODEV;
}
- if (0 !=
- pci_read_config_word(dev, VIA686A_ENABLE_REG, &val))
+ if (pci_read_config_word(dev, VIA686A_ENABLE_REG, &val))
return -ENODEV;
if (!(val & 0x0001)) {
if (!force_addr) {
@@ -890,9 +887,7 @@ static int via686a_pci_probe(struct pci_dev *dev,
}
dev_warn(&dev->dev, "Enabling sensors\n");
- if (0 !=
- pci_write_config_word(dev, VIA686A_ENABLE_REG,
- val | 0x0001))
+ if (pci_write_config_word(dev, VIA686A_ENABLE_REG, val | 0x0001))
return -ENODEV;
}
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index cc1d24c2a2c8..ee6cd6b85f91 100644
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -987,13 +987,11 @@ static int vt8231_pci_probe(struct pci_dev *dev,
dev_warn(&dev->dev, "Forcing ISA address 0x%x\n",
address);
- if (0 !=
- pci_write_config_word(dev, VT8231_BASE_REG, address | 1))
+ if (pci_write_config_word(dev, VT8231_BASE_REG, address | 1))
return -ENODEV;
}
- if (0 != pci_read_config_word(dev, VT8231_BASE_REG,
- &val))
+ if (pci_read_config_word(dev, VT8231_BASE_REG, &val))
return -ENODEV;
address = val & ~(VT8231_EXTENT - 1);
@@ -1002,15 +1000,12 @@ static int vt8231_pci_probe(struct pci_dev *dev,
return -ENODEV;
}
- if (0 != pci_read_config_word(dev, VT8231_ENABLE_REG,
- &val))
+ if (pci_read_config_word(dev, VT8231_ENABLE_REG, &val))
return -ENODEV;
if (!(val & 0x0001)) {
dev_warn(&dev->dev, "enabling sensors\n");
- if (0 !=
- pci_write_config_word(dev, VT8231_ENABLE_REG,
- val | 0x0001))
+ if (pci_write_config_word(dev, VT8231_ENABLE_REG, val | 0x0001))
return -ENODEV;
}
--
2.18.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [RFC PATCH 16/35] hwmon: (sis5595) Change PCIBIOS_SUCCESSFUL to 0
2020-07-13 12:22 ` [RFC PATCH 16/35] hwmon: (sis5595) Change PCIBIOS_SUCCESSFUL to 0 Saheed O. Bolarinwa
@ 2020-07-14 5:02 ` Guenter Roeck
0 siblings, 0 replies; 4+ messages in thread
From: Guenter Roeck @ 2020-07-14 5:02 UTC (permalink / raw)
To: Saheed O. Bolarinwa, helgaas, Jean Delvare
Cc: bjorn, skhan, linux-pci, linux-kernel-mentees, linux-kernel, linux-hwmon
On 7/13/20 5:22 AM, Saheed O. Bolarinwa wrote:
> In reference to the PCI spec (Chapter 2), PCIBIOS* is an x86 concept.
> Their scope should be limited within arch/x86.
>
> Change all PCIBIOS_SUCCESSFUL to 0
>
> Signed-off-by: "Saheed O. Bolarinwa" <refactormyself@gmail.com>
> ---
> drivers/hwmon/sis5595.c | 8 ++++----
> drivers/hwmon/via686a.c | 8 ++++----
> drivers/hwmon/vt8231.c | 8 ++++----
> 3 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
> index 0c6741f949f5..0ea174fb3048 100644
> --- a/drivers/hwmon/sis5595.c
> +++ b/drivers/hwmon/sis5595.c
> @@ -825,7 +825,7 @@ static int sis5595_pci_probe(struct pci_dev *dev,
> pci_write_config_word(dev, SIS5595_BASE_REG, force_addr);
> }
>
> - if (PCIBIOS_SUCCESSFUL !=
> + if (0 !=
> pci_read_config_word(dev, SIS5595_BASE_REG, &address)) {
Yoda programming already terrible is, but "0 !=" is even worse than that
(and completely unnecessary). If you want to clean this up, do it right
and drop those unnecessary comparisons.
Guenter
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RFC PATCH 17/35] hwmon: (sis5595) Tidy Success/Failure checks
2020-07-13 12:22 ` [RFC PATCH 17/35] hwmon: (sis5595) Tidy Success/Failure checks Saheed O. Bolarinwa
@ 2020-07-14 5:04 ` Guenter Roeck
0 siblings, 0 replies; 4+ messages in thread
From: Guenter Roeck @ 2020-07-14 5:04 UTC (permalink / raw)
To: Saheed O. Bolarinwa, helgaas, Jean Delvare
Cc: bjorn, skhan, linux-pci, linux-kernel-mentees, linux-kernel, linux-hwmon
On 7/13/20 5:22 AM, Saheed O. Bolarinwa wrote:
> Remove unnecessary check for 0.
>
> Signed-off-by: "Saheed O. Bolarinwa" <refactormyself@gmail.com>
> ---
> This patch depends on PATCH 16/35
>
> drivers/hwmon/sis5595.c | 13 ++++---------
> drivers/hwmon/via686a.c | 13 ++++---------
> drivers/hwmon/vt8231.c | 13 ++++---------
> 3 files changed, 12 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
> index 0ea174fb3048..91fdddaa4136 100644
> --- a/drivers/hwmon/sis5595.c
> +++ b/drivers/hwmon/sis5595.c
> @@ -825,8 +825,7 @@ static int sis5595_pci_probe(struct pci_dev *dev,
> pci_write_config_word(dev, SIS5595_BASE_REG, force_addr);
> }
>
> - if (0 !=
> - pci_read_config_word(dev, SIS5595_BASE_REG, &address)) {
> + if (pci_read_config_word(dev, SIS5595_BASE_REG, &address)) {
Ah, there is is, and I see that others commented on it.
Single patch, please.
Guenter
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-14 5:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20200713122247.10985-1-refactormyself@gmail.com>
2020-07-13 12:22 ` [RFC PATCH 16/35] hwmon: (sis5595) Change PCIBIOS_SUCCESSFUL to 0 Saheed O. Bolarinwa
2020-07-14 5:02 ` Guenter Roeck
2020-07-13 12:22 ` [RFC PATCH 17/35] hwmon: (sis5595) Tidy Success/Failure checks Saheed O. Bolarinwa
2020-07-14 5:04 ` Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).