xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtc: cmos: Call rtc_wake_setup() from cmos_do_probe()

Browse Source 
[ Upstream commit 375bbba09692fe4c5218eddee8e312dd733fa846 ]

To reduce code duplication, move the invocation of rtc_wake_setup()
into cmos_do_probe() and simplify the callers of the latter.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Zhang Rui <rui.zhang@intel.com>
Tested-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/2143522.irdbgypaU6@kreacher
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Stable-dep-of: 83ebb7b3036d ("rtc: cmos: Disable ACPI RTC event on removal")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Rafael J. Wysocki
2022-11-09 13:09:07 +01:00
committed by Greg Kroah-Hartman
parent 14ad1353c5
commit 462db582e8
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/rtc/rtc-cmos.c
View File

@@ -750,6 +750,7 @@ static irqreturn_t cmos_interrupt(int irq, void *p)
return IRQ_NONE; return IRQ_NONE;
} }
static inline void rtc_wake_setup(struct device *dev);
static void cmos_wake_setup(struct device *dev); static void cmos_wake_setup(struct device *dev);
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
@@ -943,6 +944,13 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
if (rtc_nvmem_register(cmos_rtc.rtc, &nvmem_cfg)) if (rtc_nvmem_register(cmos_rtc.rtc, &nvmem_cfg))
dev_err(dev, "nvmem registration failed\n"); dev_err(dev, "nvmem registration failed\n");
/*
* Everything has gone well so far, so by default register a handler for
* the ACPI RTC fixed event.
*/
if (!info)
rtc_wake_setup(dev);
dev_info(dev, "%s%s, %d bytes nvram%s\n", dev_info(dev, "%s%s, %d bytes nvram%s\n",
!is_valid_irq(rtc_irq) ? "no alarms" : !is_valid_irq(rtc_irq) ? "no alarms" :
cmos_rtc.mon_alrm ? "alarms up to one year" : cmos_rtc.mon_alrm ? "alarms up to one year" :
@@ -1362,7 +1370,7 @@ static void rtc_wake_setup(struct device *dev)
static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
{ {
int irq, ret; int irq;
if (pnp_port_start(pnp, 0) == 0x70 && !pnp_irq_valid(pnp, 0)) { if (pnp_port_start(pnp, 0) == 0x70 && !pnp_irq_valid(pnp, 0)) {
irq = 0; irq = 0;
@@ -1378,13 +1386,7 @@ static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
irq = pnp_irq(pnp, 0); irq = pnp_irq(pnp, 0);
} }
ret = cmos_do_probe(&pnp->dev, pnp_get_resource(pnp, IORESOURCE_IO, 0), irq); return cmos_do_probe(&pnp->dev, pnp_get_resource(pnp, IORESOURCE_IO, 0), irq);
if (ret)
return ret;
rtc_wake_setup(&pnp->dev);
return 0;
} }
static void cmos_pnp_remove(struct pnp_dev *pnp) static void cmos_pnp_remove(struct pnp_dev *pnp)
@@ -1468,7 +1470,7 @@ static inline void cmos_of_init(struct platform_device *pdev) {}
static int __init cmos_platform_probe(struct platform_device *pdev) static int __init cmos_platform_probe(struct platform_device *pdev)
{ {
struct resource *resource; struct resource *resource;
int irq, ret; int irq;
cmos_of_init(pdev); cmos_of_init(pdev);
@@ -1480,13 +1482,7 @@ static int __init cmos_platform_probe(struct platform_device *pdev)
if (irq < 0) if (irq < 0)
irq = -1; irq = -1;
ret = cmos_do_probe(&pdev->dev, resource, irq); return cmos_do_probe(&pdev->dev, resource, irq);
if (ret)
return ret;
rtc_wake_setup(&pdev->dev);
return 0;
} }
static int cmos_platform_remove(struct platform_device *pdev) static int cmos_platform_remove(struct platform_device *pdev)