Skip to contentSkip to conversation

S3C64XX: Staticise audio platform data

PATCH New Mark Brown 2 participants 4 messages Jan 20, 2010 – Jan 21, 2010

Subsystems (3)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/2 S3C64XX: Staticise audio platform data

It's not exported.

---
 arch/arm/plat-s3c64xx/dev-audio.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/plat-s3c64xx/dev-audio.c +3 -3
index 5b89344..f6b7bfb 100644
@@ -80,7 +80,7 @@ static struct resource s3c64xx_iis0_resource[] = {
 	},
 };
 
-struct s3c_audio_pdata s3c_i2s0_pdata = {
+static struct s3c_audio_pdata s3c_i2s0_pdata = {
 	.cfg_gpio = s3c64xx_i2sv3_cfg_gpio,
 };
 
@@ -113,7 +113,7 @@ static struct resource s3c64xx_iis1_resource[] = {
 	},
 };
 
-struct s3c_audio_pdata s3c_i2s1_pdata = {
+static struct s3c_audio_pdata s3c_i2s1_pdata = {
 	.cfg_gpio = s3c64xx_i2sv3_cfg_gpio,
 };
 
@@ -146,7 +146,7 @@ static struct resource s3c64xx_iisv4_resource[] = {
 	},
 };
 
-struct s3c_audio_pdata s3c_i2sv4_pdata = {
+static struct s3c_audio_pdata s3c_i2sv4_pdata = {
 	.cfg_gpio = s3c64xx_i2sv4_cfg_gpio,
 };
 
Signature · 1 line
1.6.6
author
#1 lore raw

PATCH 2/2 SAMSUNG: Staticise gpiolib implementation functions

They are not exported, they are referenced via vtables.

---
 arch/arm/plat-samsung/gpiolib.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
arch/arm/plat-samsung/gpiolib.c +9 -7
index 3419b67..8a8ba8b 100644
@@ -44,7 +44,8 @@
  * the output.
 */
 
-int samsung_gpiolib_4bit_input(struct gpio_chip *chip, unsigned int offset)
+static int samsung_gpiolib_4bit_input(struct gpio_chip *chip,
+				      unsigned int offset)
 {
 	struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
 	void __iomem *base = ourchip->base;
@@ -59,8 +60,8 @@ int samsung_gpiolib_4bit_input(struct gpio_chip *chip, unsigned int offset)
 	return 0;
 }
 
-int samsung_gpiolib_4bit_output(struct gpio_chip *chip,
-				unsigned int offset, int value)
+static int samsung_gpiolib_4bit_output(struct gpio_chip *chip,
+				       unsigned int offset, int value)
 {
 	struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
 	void __iomem *base = ourchip->base;
@@ -106,9 +107,10 @@ int samsung_gpiolib_4bit_output(struct gpio_chip *chip,
  * To allow us to use the s3c_gpiolib_get and s3c_gpiolib_set routines we
  * store the 'base + 0x4' address so that these routines see the data
  * register at ourchip->base + 0x04.
-*/
+ */
 
-int samsung_gpiolib_4bit2_input(struct gpio_chip *chip, unsigned int offset)
+static int samsung_gpiolib_4bit2_input(struct gpio_chip *chip,
+				       unsigned int offset)
 {
 	struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
 	void __iomem *base = ourchip->base;
@@ -129,8 +131,8 @@ int samsung_gpiolib_4bit2_input(struct gpio_chip *chip, unsigned int offset)
 	return 0;
 }
 
-int samsung_gpiolib_4bit2_output(struct gpio_chip *chip,
-				 unsigned int offset, int value)
+static int samsung_gpiolib_4bit2_output(struct gpio_chip *chip,
+					unsigned int offset, int value)
 {
 	struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
 	void __iomem *base = ourchip->base;
Signature · 1 line
1.6.6
Applied
#2 lore raw

PATCH 1/2 S3C64XX: Staticise audio platform data

In reply to Mark Brown
Quoted 1 line · Mark Brown

It's not exported.

applied these all to next-samsung-s3c64xx2, will merge into next-samsung

next time, please add ARM: to the prefix, it would save time when applying to the tree.

Quoted 39 lines
---
 arch/arm/plat-s3c64xx/dev-audio.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/plat-s3c64xx/dev-audio.c +3 -3
index 5b89344..f6b7bfb 100644
@@ -80,7 +80,7 @@ static struct resource s3c64xx_iis0_resource[] = {
 	},
 };
 
-struct s3c_audio_pdata s3c_i2s0_pdata = {
+static struct s3c_audio_pdata s3c_i2s0_pdata = {
 	.cfg_gpio = s3c64xx_i2sv3_cfg_gpio,
 };
 
@@ -113,7 +113,7 @@ static struct resource s3c64xx_iis1_resource[] = {
 	},
 };
 
-struct s3c_audio_pdata s3c_i2s1_pdata = {
+static struct s3c_audio_pdata s3c_i2s1_pdata = {
 	.cfg_gpio = s3c64xx_i2sv3_cfg_gpio,
 };
 
@@ -146,7 +146,7 @@ static struct resource s3c64xx_iisv4_resource[] = {
 	},
 };
 
-struct s3c_audio_pdata s3c_i2sv4_pdata = {
+static struct s3c_audio_pdata s3c_i2sv4_pdata = {
 	.cfg_gpio = s3c64xx_i2sv4_cfg_gpio,
 };
 
Signature · 1 line
1.6.6
Signature · 5 lines
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
author
#3 lore raw

PATCH 1/2 S3C64XX: Staticise audio platform data

Quoted 7 lines · Ben Dooks
Quoted 1 line · Mark Brown

It's not exported.

applied these all to next-samsung-s3c64xx2, will merge into next-samsung

next time, please add ARM: to the prefix, it would save time when applying to the tree.

Is that definite? The ARM generic bit of the prefix seems to waver between [ARM] and ARM:.