summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpi_processor.c
diff options
context:
space:
mode:
authorHanjun Guo <hanjun.guo@linaro.org>2013-09-02 05:57:38 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-09-24 01:39:40 +0200
commit082e12a05cf317acec2feaf3a78de3f3372feeb3 (patch)
treea55906aea327d7d74e2dc69e40d04031d8df2611 /drivers/acpi/acpi_processor.c
parentACPI / processor: remove some dead code in acpi_processor_get_info() (diff)
downloadlinux-082e12a05cf317acec2feaf3a78de3f3372feeb3.tar.xz
linux-082e12a05cf317acec2feaf3a78de3f3372feeb3.zip
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.c8
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)
return 0;
}
-static int acpi_processor_errata(struct acpi_processor *pr)
+static int acpi_processor_errata(void)
{
int result = 0;
struct pci_dev *dev = NULL;
-
- if (!pr)
- return -EINVAL;
-
/*
* PIIX4
*/
@@ -220,7 +216,7 @@ static int acpi_processor_get_info(struct acpi_device *device)
acpi_status status = AE_OK;
static int cpu0_initialized;
- acpi_processor_errata(pr);
+ acpi_processor_errata();
/*
* Check to see if we have bus mastering arbitration control. This