From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org
Cc: johnpol@2ka.mipt.ru
Subject: [PATCH] w1: Core cleanup 1/2
Date: Fri, 4 Mar 2005 12:39:42 -0800 [thread overview]
Message-ID: <11099687824109@kroah.com> (raw)
In-Reply-To: <11099687822751@kroah.com>
ChangeSet 1.2082, 2005/03/02 16:58:52-08:00, johnpol@2ka.mipt.ru
[PATCH] w1: Core cleanup 1/2
Trivial cleanups, mostly static/non static, removed unneded exports.
It fuzzes a bit, sorry, patch is quite old.
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/w1/w1.c | 23 ++++++++++-------------
drivers/w1/w1_family.c | 2 --
drivers/w1/w1_int.c | 3 ---
3 files changed, 10 insertions(+), 18 deletions(-)
diff -Nru a/drivers/w1/w1.c b/drivers/w1/w1.c
--- a/drivers/w1/w1.c 2005-03-04 12:38:12 -08:00
+++ b/drivers/w1/w1.c 2005-03-04 12:38:12 -08:00
@@ -19,8 +19,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <asm/atomic.h>
-
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@ -33,6 +31,8 @@
#include <linux/slab.h>
#include <linux/sched.h>
+#include <asm/atomic.h>
+
#include "w1.h"
#include "w1_io.h"
#include "w1_log.h"
@@ -100,7 +100,7 @@
return sprintf(buf, "No family registered.\n");
}
-struct bus_type w1_bus_type = {
+static struct bus_type w1_bus_type = {
.name = "w1",
.match = w1_master_match,
};
@@ -138,7 +138,7 @@
.show = &w1_default_read_name,
};
-ssize_t w1_master_attribute_show_name(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_name(struct device *dev, char *buf)
{
struct w1_master *md = container_of (dev, struct w1_master, dev);
ssize_t count;
@@ -153,7 +153,7 @@
return count;
}
-ssize_t w1_master_attribute_show_pointer(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_pointer(struct device *dev, char *buf)
{
struct w1_master *md = container_of(dev, struct w1_master, dev);
ssize_t count;
@@ -167,14 +167,14 @@
return count;
}
-ssize_t w1_master_attribute_show_timeout(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_timeout(struct device *dev, char *buf)
{
ssize_t count;
count = sprintf(buf, "%d\n", w1_timeout);
return count;
}
-ssize_t w1_master_attribute_show_max_slave_count(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_max_slave_count(struct device *dev, char *buf)
{
struct w1_master *md = container_of(dev, struct w1_master, dev);
ssize_t count;
@@ -188,7 +188,7 @@
return count;
}
-ssize_t w1_master_attribute_show_attempts(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_attempts(struct device *dev, char *buf)
{
struct w1_master *md = container_of(dev, struct w1_master, dev);
ssize_t count;
@@ -202,7 +202,7 @@
return count;
}
-ssize_t w1_master_attribute_show_slave_count(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_slave_count(struct device *dev, char *buf)
{
struct w1_master *md = container_of(dev, struct w1_master, dev);
ssize_t count;
@@ -216,7 +216,7 @@
return count;
}
-ssize_t w1_master_attribute_show_slaves(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_slaves(struct device *dev, char *buf)
{
struct w1_master *md = container_of(dev, struct w1_master, dev);
@@ -839,6 +839,3 @@
module_init(w1_init);
module_exit(w1_fini);
-
-EXPORT_SYMBOL(w1_create_master_attributes);
-EXPORT_SYMBOL(w1_destroy_master_attributes);
diff -Nru a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
--- a/drivers/w1/w1_family.c 2005-03-04 12:38:12 -08:00
+++ b/drivers/w1/w1_family.c 2005-03-04 12:38:12 -08:00
@@ -143,8 +143,6 @@
EXPORT_SYMBOL(w1_family_get);
EXPORT_SYMBOL(w1_family_put);
-EXPORT_SYMBOL(__w1_family_get);
-EXPORT_SYMBOL(__w1_family_put);
EXPORT_SYMBOL(w1_family_registered);
EXPORT_SYMBOL(w1_unregister_family);
EXPORT_SYMBOL(w1_register_family);
diff -Nru a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
--- a/drivers/w1/w1_int.c 2005-03-04 12:38:12 -08:00
+++ b/drivers/w1/w1_int.c 2005-03-04 12:38:12 -08:00
@@ -217,8 +217,5 @@
__w1_remove_master_device(dev);
}
-EXPORT_SYMBOL(w1_alloc_dev);
-EXPORT_SYMBOL(w1_free_dev);
EXPORT_SYMBOL(w1_add_master_device);
EXPORT_SYMBOL(w1_remove_master_device);
-EXPORT_SYMBOL(__w1_remove_master_device);
next prev parent reply other threads:[~2005-03-04 21:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-04 20:39 [BK PATCH] W1 patches for 2.6.11 Greg KH
2005-03-04 20:39 ` [PATCH] w1/w1_therm: replace schedule_timeout() with msleep_interruptible() Greg KH
2005-03-04 20:39 ` [PATCH] w1: dscore cleanups. 2/2 Greg KH
2005-03-04 20:39 ` Greg KH [this message]
2005-03-04 20:39 ` [PATCH] w1: fix some compiler warnings generated by the last "static" patch Greg KH
2005-03-04 20:39 ` [PATCH] w1: replace obsoleted *sleep_on* Greg KH
2005-03-04 20:39 ` [PATCH] w1: get rid of the potential problems with atomic operations Greg KH
2005-03-04 20:39 ` [PATCH] drivers/w1/*: convert to pci_register_driver Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11099687824109@kroah.com \
--to=greg@kroah.com \
--cc=johnpol@2ka.mipt.ru \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox