diff options
author | Hanjun Guo <hanjun.guo@linaro.org> | 2013-09-01 23:57:38 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-09-23 19:39:40 -0400 |
commit | 082e12a05cf317acec2feaf3a78de3f3372feeb3 (patch) | |
tree | a55906aea327d7d74e2dc69e40d04031d8df2611 /drivers/acpi/acpi_processor.c | |
parent | 2d4d3e2a06bd25fba52a4693b09ec72d61d250d9 (diff) |
ACPI / processor: remove unnecessary if (!pr) check
acpi_processor_errata() is only called in acpi_processor_get_info(),
and the argument 'pr' passed to acpi_processor_errata() will never be
NULL, so the if (!pr) check is unnecessary and can be removed.
Since the 'pr' argument is not used by acpi_processor_errata() any more,
so change the argument into void too.
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpi_processor.c')
-rw-r--r-- | drivers/acpi/acpi_processor.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 5364d029b8e9..7ce075008034 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c | |||
@@ -140,15 +140,11 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev) | |||
140 | return 0; | 140 | return 0; |
141 | } | 141 | } |
142 | 142 | ||
143 | static int acpi_processor_errata(struct acpi_processor *pr) | 143 | static int acpi_processor_errata(void) |
144 | { | 144 | { |
145 | int result = 0; | 145 | int result = 0; |
146 | struct pci_dev *dev = NULL; | 146 | struct pci_dev *dev = NULL; |
147 | 147 | ||
148 | |||
149 | if (!pr) | ||
150 | return -EINVAL; | ||
151 | |||
152 | /* | 148 | /* |
153 | * PIIX4 | 149 | * PIIX4 |
154 | */ | 150 | */ |
@@ -220,7 +216,7 @@ static int acpi_processor_get_info(struct acpi_device *device) | |||
220 | acpi_status status = AE_OK; | 216 | acpi_status status = AE_OK; |
221 | static int cpu0_initialized; | 217 | static int cpu0_initialized; |
222 | 218 | ||
223 | acpi_processor_errata(pr); | 219 | acpi_processor_errata(); |
224 | 220 | ||
225 | /* | 221 | /* |
226 | * Check to see if we have bus mastering arbitration control. This | 222 | * Check to see if we have bus mastering arbitration control. This |