Commit 375bbba0 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Alexandre Belloni
Browse files

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



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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarZhang Rui <rui.zhang@intel.com>
Tested-by: default avatarZhang Rui <rui.zhang@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/2143522.irdbgypaU6@kreacher


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 508ccdfb

drivers/rtc/rtc-cmos.c

+12 −16
Original line number Diff line number Diff line
@@ -744,6 +744,7 @@ static irqreturn_t cmos_interrupt(int irq, void *p) 
		return IRQ_NONE;

}



static inline void rtc_wake_setup(struct device *dev);

static void cmos_wake_setup(struct device *dev);



#ifdef	CONFIG_PNP
@@ -938,6 +939,13 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) 
	nvmem_cfg.size = address_space - NVRAM_OFFSET;

	devm_rtc_nvmem_register(cmos_rtc.rtc, &nvmem_cfg);



	/*

	 * 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",

		 !is_valid_irq(rtc_irq) ? "no alarms" :

		 cmos_rtc.mon_alrm ? "alarms up to one year" :
@@ -1357,7 +1365,7 @@ static void rtc_wake_setup(struct device *dev) 


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)) {

		irq = 0;
@@ -1373,13 +1381,7 @@ static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) 
		irq = pnp_irq(pnp, 0);

	}



	ret = cmos_do_probe(&pnp->dev, pnp_get_resource(pnp, IORESOURCE_IO, 0), irq);

	if (ret)

		return ret;



	rtc_wake_setup(&pnp->dev);



	return 0;

	return cmos_do_probe(&pnp->dev, pnp_get_resource(pnp, IORESOURCE_IO, 0), irq);

}



static void cmos_pnp_remove(struct pnp_dev *pnp)
@@ -1463,7 +1465,7 @@ static inline void cmos_of_init(struct platform_device *pdev) {} 
static int __init cmos_platform_probe(struct platform_device *pdev)

{

	struct resource *resource;

	int irq, ret;

	int irq;



	cmos_of_init(pdev);
@@ -1475,13 +1477,7 @@ static int __init cmos_platform_probe(struct platform_device *pdev) 
	if (irq < 0)

		irq = -1;



	ret = cmos_do_probe(&pdev->dev, resource, irq);

	if (ret)

		return ret;



	rtc_wake_setup(&pdev->dev);



	return 0;

	return cmos_do_probe(&pdev->dev, resource, irq);

}



static int cmos_platform_remove(struct platform_device *pdev)