diff options
| author | Olof Johansson <olof@lixom.net> | 2019-06-25 05:51:29 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-06-25 05:51:29 -0700 |
| commit | f7fd41afa15de2555ccf352b1849ab9c37d1ec33 (patch) | |
| tree | 433b197c81350015fb143c40903192f19dded2a6 /arch/arm/mach-pxa | |
| parent | abd6aa55d72e4e574935dee897d8bdcb0858c9ee (diff) | |
| parent | f5a38c8ecf523e3b14c3766acf0d3119d96e8438 (diff) | |
| download | linux-f7fd41afa15de2555ccf352b1849ab9c37d1ec33.tar.bz2 | |
Merge tag 'pxa-for-5.3-2' of https://github.com/rjarzmik/linux into arm/soc
This is the pxa changes for 5.3 cycle :
- a simple cleanup for lubbock
* tag 'pxa-for-5.3-2' of https://github.com/rjarzmik/linux:
ARM: pxa/lubbock: remove lubbock_set_misc_wr() from global view
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/lubbock.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/lubbock.c | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/include/mach/lubbock.h b/arch/arm/mach-pxa/include/mach/lubbock.h index 1eecf794acd2..9926a5d741f7 100644 --- a/arch/arm/mach-pxa/include/mach/lubbock.h +++ b/arch/arm/mach-pxa/include/mach/lubbock.h @@ -50,7 +50,3 @@ #define LUBBOCK_LAST_IRQ LUBBOCK_IRQ(6) #define LUBBOCK_SA1111_IRQ_BASE (LUBBOCK_NR_IRQS + 32) - -#ifndef __ASSEMBLY__ -extern void lubbock_set_misc_wr(unsigned int mask, unsigned int set); -#endif diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index 825939877839..a74306f76c13 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c @@ -119,12 +119,11 @@ void lubbock_set_hexled(uint32_t value) static struct gpio_chip *lubbock_misc_wr_gc; -void lubbock_set_misc_wr(unsigned int mask, unsigned int set) +static void lubbock_set_misc_wr(unsigned int mask, unsigned int set) { unsigned long m = mask, v = set; lubbock_misc_wr_gc->set_multiple(lubbock_misc_wr_gc, &m, &v); } -EXPORT_SYMBOL(lubbock_set_misc_wr); static int lubbock_udc_is_connected(void) { |