Merge branches 'acpi-apei', 'acpi-doc' and 'acpi-soc'
* acpi-apei: ACPI / APEI: Remove needless __ghes_check_estatus() calls * acpi-doc: docs: extcon: convert it to ReST and move to ACPI dir * acpi-soc: ACPI: APD: remove redundant assignment to pointer clk
This commit is contained in:
@@ -57,7 +57,7 @@ struct apd_private_data {
|
||||
static int acpi_apd_setup(struct apd_private_data *pdata)
|
||||
{
|
||||
const struct apd_device_desc *dev_desc = pdata->dev_desc;
|
||||
struct clk *clk = ERR_PTR(-ENODEV);
|
||||
struct clk *clk;
|
||||
|
||||
if (dev_desc->fixed_clk_rate) {
|
||||
clk = clk_register_fixed_rate(&pdata->adev->dev,
|
||||
|
@@ -345,7 +345,7 @@ static int __ghes_peek_estatus(struct ghes *ghes,
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
return __ghes_check_estatus(ghes, estatus);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __ghes_read_estatus(struct acpi_hest_generic_status *estatus,
|
||||
|
Reference in New Issue
Block a user