From: Liam Girdwood <lrg@slimlogic.co.uk>
Date: Tue, 28 Apr 2009 11:01:16 +0000 (+0100)
Subject: regulator: build fix for powerpc - renamed show_state
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7c314991d7d7ad4edf96e8322bcb30e8452957b7;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

regulator: build fix for powerpc - renamed show_state

This patch fixes the follwing build failure on powerpc:-

> Today's linux-next build (powerpc allyesconfig) failed like this:
>
> drivers/regulator/userspace-consumer.c:43: error: conflicting types
> for 'show_state'
> include/linux/sched.h:273: note: previous definition of 'show_state'
> was here
>
> Caused by commit 5defa2bce704ca4151cfe24e4297aa7797cafd22 ("regulator:
> add userspace-consumer driver") which I have reverted for today.

Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
---

diff --git a/drivers/regulator/userspace-consumer.c b/drivers/regulator/userspace-consumer.c
index 71fcf9df00f6..06d2fa96a8b4 100644
--- a/drivers/regulator/userspace-consumer.c
+++ b/drivers/regulator/userspace-consumer.c
@@ -32,7 +32,7 @@ struct userspace_consumer_data {
 	struct regulator_bulk_data *supplies;
 };
 
-static ssize_t show_name(struct device *dev,
+static ssize_t reg_show_name(struct device *dev,
 			  struct device_attribute *attr, char *buf)
 {
 	struct userspace_consumer_data *data = dev_get_drvdata(dev);
@@ -40,7 +40,7 @@ static ssize_t show_name(struct device *dev,
 	return sprintf(buf, "%s\n", data->name);
 }
 
-static ssize_t show_state(struct device *dev,
+static ssize_t reg_show_state(struct device *dev,
 			  struct device_attribute *attr, char *buf)
 {
 	struct userspace_consumer_data *data = dev_get_drvdata(dev);
@@ -51,7 +51,7 @@ static ssize_t show_state(struct device *dev,
 	return sprintf(buf, "disabled\n");
 }
 
-static ssize_t set_state(struct device *dev, struct device_attribute *attr,
+static ssize_t reg_set_state(struct device *dev, struct device_attribute *attr,
 			 const char *buf, size_t count)
 {
 	struct userspace_consumer_data *data = dev_get_drvdata(dev);
@@ -90,8 +90,8 @@ static ssize_t set_state(struct device *dev, struct device_attribute *attr,
 	return count;
 }
 
-static DEVICE_ATTR(name, 0444, show_name, NULL);
-static DEVICE_ATTR(state, 0644, show_state, set_state);
+static DEVICE_ATTR(name, 0444, reg_show_name, NULL);
+static DEVICE_ATTR(state, 0644, reg_show_state, reg_set_state);
 
 static struct device_attribute *attributes[] = {
 	&dev_attr_name,