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

Commit faad2b87 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

ANDROID: rfkill: fix unused function warning 

As reported by kernelci, we get a harmless warning in this driver
when CONFIG_PM is disabled:

net/rfkill/core.c:810:12: warning: 'rfkill_resume' defined but not used [-Wunused-function]
net/rfkill/core.c:800:12: warning: 'rfkill_suspend' defined but not used [-Wunused-function]

This marks the functions as __maybe_unused to remove the #ifdef, and uses
a conditional reference to the pm operations instead, which will work
in any combination.

The patch is needed for both android-common-4.9 and 4.4.

Link: https://kernelci.org/build/id/59117c2f59b5147b06b12d54/logs/


Fixes: de6f7210 ("ANDROID: rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down")
Cc: Nick Pelly <npelly@google.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent f117eaf0

net/rfkill/core.c

+3 −10
Original line number Diff line number Diff line
@@ -796,8 +796,7 @@ void rfkill_resume_polling(struct rfkill *rfkill) 
}

EXPORT_SYMBOL(rfkill_resume_polling);



#ifdef CONFIG_RFKILL_PM

static int rfkill_suspend(struct device *dev)

static __maybe_unused int rfkill_suspend(struct device *dev)

{

	struct rfkill *rfkill = to_rfkill(dev);
@@ -807,7 +806,7 @@ static int rfkill_suspend(struct device *dev) 
	return 0;

}



static int rfkill_resume(struct device *dev)

static __maybe_unused int rfkill_resume(struct device *dev)

{

	struct rfkill *rfkill = to_rfkill(dev);

	bool cur;
@@ -827,19 +826,13 @@ static int rfkill_resume(struct device *dev) 
}



static SIMPLE_DEV_PM_OPS(rfkill_pm_ops, rfkill_suspend, rfkill_resume);

#define RFKILL_PM_OPS (&rfkill_pm_ops)

#else

#define RFKILL_PM_OPS NULL

#endif



static struct class rfkill_class = {

	.name		= "rfkill",

	.dev_release	= rfkill_release,

	.dev_groups	= rfkill_dev_groups,

	.dev_uevent	= rfkill_dev_uevent,

#ifdef CONFIG_RFKILL_PM

	.pm		= RFKILL_PM_OPS,

#endif

	.pm		= IS_ENABLED(CONFIG_RFKILL_PM) ? &rfkill_pm_ops : NULL,

};



bool rfkill_blocked(struct rfkill *rfkill)