Commit 79d09a68 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by sanglipeng
Browse files

ARM: pxa: remove use of symbol_get() 

stable inclusion
from stable-v5.10.195
commit c1112a2b54ce099eddb11dc0a9a583bc5f8dc454
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I95JOC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c1112a2b54ce099eddb11dc0a9a583bc5f8dc454

--------------------------------

commit 0faa29c4 upstream.

The spitz board file uses the obscure symbol_get() function
to optionally call a function from sharpsl_pm.c if that is
built. However, the two files are always built together
these days, and have been for a long time, so this can
be changed to a normal function call.

Link: https://lore.kernel.org/lkml/20230731162639.GA9441@lst.de/


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 234d08bb

arch/arm/mach-pxa/sharpsl_pm.c

+0 −2
Original line number Diff line number Diff line
@@ -220,8 +220,6 @@ void sharpsl_battery_kick(void) 
{

	schedule_delayed_work(&sharpsl_bat, msecs_to_jiffies(125));

}

EXPORT_SYMBOL(sharpsl_battery_kick);





static void sharpsl_battery_thread(struct work_struct *private_)

{

arch/arm/mach-pxa/spitz.c

+1 −13
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 */



#include <linux/kernel.h>

#include <linux/module.h>	/* symbol_get ; symbol_put */

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/gpio_keys.h>
@@ -514,17 +513,6 @@ static struct pxa2xx_spi_chip spitz_ads7846_chip = { 
	.gpio_cs		= SPITZ_GPIO_ADS7846_CS,

};



static void spitz_bl_kick_battery(void)

{

	void (*kick_batt)(void);



	kick_batt = symbol_get(sharpsl_battery_kick);

	if (kick_batt) {

		kick_batt();

		symbol_put(sharpsl_battery_kick);

	}

}



static struct gpiod_lookup_table spitz_lcdcon_gpio_table = {

	.dev_id = "spi2.1",

	.table = {
@@ -552,7 +540,7 @@ static struct corgi_lcd_platform_data spitz_lcdcon_info = { 
	.max_intensity		= 0x2f,

	.default_intensity	= 0x1f,

	.limit_mask		= 0x0b,

	.kick_battery		= spitz_bl_kick_battery,

	.kick_battery		= sharpsl_battery_kick,

};



static struct pxa2xx_spi_chip spitz_lcdcon_chip = {