a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fbdev: sm712fb: avoid unused function warnings

Browse Source 
commit 24ed78dc2e8b2428eccc70c3162e70d33ab448c4 upstream.

The sm712fb framebuffer driver encloses the power-management
functions in #ifdef CONFIG_PM, but the smtcfb_pci_suspend/resume
functions are only really used when CONFIG_PM_SLEEP is also
set, as a frequent gcc warning shows:

fbdev/sm712fb.c:1549:12: warning: 'smtcfb_pci_suspend' defined but not used
fbdev/sm712fb.c:1572:12: warning: 'smtcfb_pci_resume' defined but not used

The driver also avoids using the SIMPLE_DEV_PM_OPS macro when
CONFIG_PM is unset, which is redundant.

This changes the driver to remove the #ifdef and instead mark
the functions as __maybe_unused, which is a nicer anyway, as it
provides build testing for all the code in all configurations
and is harder to get wrong.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann 2015-11-20 22:48:36 +01:00 committed by Greg Kroah-Hartman
parent 3f488a9fd5
commit ac21d006fc
1 changed files with 3 additions and 13 deletions

16
drivers/video/fbdev/sm712fb.c
View File

@ -28,9 +28,7 @@
#include <linux/console.h> #include <linux/console.h>
#include <linux/screen_info.h> #include <linux/screen_info.h>
#ifdef CONFIG_PM
#include <linux/pm.h> #include <linux/pm.h>
#endif
#include "sm712.h" #include "sm712.h"
@ -1545,8 +1543,7 @@ static void smtcfb_pci_remove(struct pci_dev *pdev)
pci_disable_device(pdev); pci_disable_device(pdev);
} }
#ifdef CONFIG_PM static int __maybe_unused smtcfb_pci_suspend(struct device *device)
static int smtcfb_pci_suspend(struct device *device)
{ {
struct pci_dev *pdev = to_pci_dev(device); struct pci_dev *pdev = to_pci_dev(device);
struct smtcfb_info *sfb; struct smtcfb_info *sfb;
@ -1569,7 +1566,7 @@ static int smtcfb_pci_suspend(struct device *device)
return 0; return 0;
} }
static int smtcfb_pci_resume(struct device *device) static int __maybe_unused smtcfb_pci_resume(struct device *device)
{ {
struct pci_dev *pdev = to_pci_dev(device); struct pci_dev *pdev = to_pci_dev(device);
struct smtcfb_info *sfb; struct smtcfb_info *sfb;
@ -1610,20 +1607,13 @@ static int smtcfb_pci_resume(struct device *device)
} }
static SIMPLE_DEV_PM_OPS(sm7xx_pm_ops, smtcfb_pci_suspend, smtcfb_pci_resume); static SIMPLE_DEV_PM_OPS(sm7xx_pm_ops, smtcfb_pci_suspend, smtcfb_pci_resume);
#define SM7XX_PM_OPS (&sm7xx_pm_ops)
#else /* !CONFIG_PM */
#define SM7XX_PM_OPS NULL
#endif /* !CONFIG_PM */
static struct pci_driver smtcfb_driver = { static struct pci_driver smtcfb_driver = {
.name = "smtcfb", .name = "smtcfb",
.id_table = smtcfb_pci_table, .id_table = smtcfb_pci_table,
.probe = smtcfb_pci_probe, .probe = smtcfb_pci_probe,
.remove = smtcfb_pci_remove, .remove = smtcfb_pci_remove,
.driver.pm = SM7XX_PM_OPS, .driver.pm = &sm7xx_pm_ops,
}; };
static int __init sm712fb_init(void) static int __init sm712fb_init(void)