Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c49870e8 authored by Dongjiu Geng's avatar Dongjiu Geng Committed by Rafael J. Wysocki
Browse files

ACPI / APEI: remove the unused dead-code for SEA/NMI notification type 



For the SEA notification, the two functions ghes_sea_add() and
ghes_sea_remove() are only called when CONFIG_ACPI_APEI_SEA
is defined. If not, it will return errors in the ghes_probe()
and not continue. If the probe is failed, the ghes_sea_remove()
also has no chance to be called. Hence, remove the unnecessary
handling when CONFIG_ACPI_APEI_SEA is not defined.

For the NMI notification, it has the same issue as SEA notification,
so also remove the unused dead-code for it.

Signed-off-by: default avatarDongjiu Geng <gengdongjiu@huawei.com>
Tested-by: default avatarTyler Baicar <tbaicar@codeaurora.org>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 095f613c

drivers/acpi/apei/ghes.c

+5 −28
Original line number Diff line number Diff line
@@ -852,17 +852,8 @@ static void ghes_sea_remove(struct ghes *ghes) 
	synchronize_rcu();

}

#else /* CONFIG_ACPI_APEI_SEA */

static inline void ghes_sea_add(struct ghes *ghes)

{

	pr_err(GHES_PFX "ID: %d, trying to add SEA notification which is not supported\n",

	       ghes->generic->header.source_id);

}



static inline void ghes_sea_remove(struct ghes *ghes)

{

	pr_err(GHES_PFX "ID: %d, trying to remove SEA notification which is not supported\n",

	       ghes->generic->header.source_id);

}

static inline void ghes_sea_add(struct ghes *ghes) { }

static inline void ghes_sea_remove(struct ghes *ghes) { }

#endif /* CONFIG_ACPI_APEI_SEA */



#ifdef CONFIG_HAVE_ACPI_APEI_NMI
@@ -1064,23 +1055,9 @@ static void ghes_nmi_init_cxt(void) 
	init_irq_work(&ghes_proc_irq_work, ghes_proc_in_irq);

}

#else /* CONFIG_HAVE_ACPI_APEI_NMI */

static inline void ghes_nmi_add(struct ghes *ghes)

{

	pr_err(GHES_PFX "ID: %d, trying to add NMI notification which is not supported!\n",

	       ghes->generic->header.source_id);

	BUG();

}



static inline void ghes_nmi_remove(struct ghes *ghes)

{

	pr_err(GHES_PFX "ID: %d, trying to remove NMI notification which is not supported!\n",

	       ghes->generic->header.source_id);

	BUG();

}



static inline void ghes_nmi_init_cxt(void)

{

}

static inline void ghes_nmi_add(struct ghes *ghes) { }

static inline void ghes_nmi_remove(struct ghes *ghes) { }

static inline void ghes_nmi_init_cxt(void) { }

#endif /* CONFIG_HAVE_ACPI_APEI_NMI */



static int ghes_probe(struct platform_device *ghes_dev)