From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
To: Adrian Bunk <bunk@stusta.de>
Cc: Andrew Morton <akpm@osdl.org>,
Greg Kroah-Hartman <gregkh@suse.de>,
linux-kernel@vger.kernel.org
Subject: Re: 2.6.17-mm1: drivers/w1/: patch undoes reasonable cleanups
Date: Tue, 4 Apr 2006 20:35:22 +0400 [thread overview]
Message-ID: <20060404163522.GA29486@2ka.mipt.ru> (raw)
In-Reply-To: <20060404160223.GG6529@stusta.de>
On Tue, Apr 04, 2006 at 06:02:23PM +0200, Adrian Bunk (bunk@stusta.de) wrote:
> On Tue, Apr 04, 2006 at 01:45:04AM -0700, Andrew Morton wrote:
> >...
> > Changes since 2.6.16-mm2:
> >...
> > +gregkh-i2c-w1-userspace-communication-protocol-over-connector.patch
> >...
> > I2C tree.
> >...
>
> Evgeniy Polyakov did ACK my patch
> a9fb1c7b950bed4afe208c9d67e20f086bb6abbb, and I'm therefore really
> pissed off seeing him silently reverting it for no good reason as part
> of this patch.
>
> Greg, please drop this patch.
I'm really sorry, Adrian, if you feel it this way.
I converted your patch to the new tree.
Peace? :)
----
Nice cleanup spotted by Adrian Bunk, which was lost due to moving to the
completely new functionality.
Shame-shame-shame on me.
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 6c23b38..174ac2b 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -214,11 +214,12 @@ struct device w1_master_device = {
.release = &w1_master_release
};
-struct device_driver w1_slave_driver = {
+static struct device_driver w1_slave_driver = {
.name = "w1_slave_driver",
.bus = &w1_bus_type,
};
+#if 0
struct device w1_slave_device = {
.parent = NULL,
.bus = &w1_bus_type,
@@ -226,6 +227,7 @@ struct device w1_slave_device = {
.driver = &w1_slave_driver,
.release = &w1_slave_release
};
+#endif /* 0 */
static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_attribute *attr, char *buf)
{
@@ -383,7 +385,7 @@ int w1_create_master_attributes(struct w
return sysfs_create_group(&master->dev.kobj, &w1_master_defattr_group);
}
-void w1_destroy_master_attributes(struct w1_master *master)
+static void w1_destroy_master_attributes(struct w1_master *master)
{
sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group);
}
diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index f5ad81d..deb3c13 100644
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -213,6 +213,16 @@ static inline struct w1_master* dev_to_w
return container_of(dev, struct w1_master, dev);
}
+extern struct device_driver w1_master_driver;
+extern struct bus_type w1_bus_type;
+extern struct device w1_master_device;
+extern int w1_max_slave_count;
+extern int w1_max_slave_ttl;
+extern struct list_head w1_masters;
+extern struct mutex w1_mlock;
+
+extern int w1_process(void *);
+
#endif /* __KERNEL__ */
#endif /* __W1_H */
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 24e7c10..475996c 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -30,16 +30,6 @@
static u32 w1_ids = 1;
-extern struct device_driver w1_master_driver;
-extern struct bus_type w1_bus_type;
-extern struct device w1_master_device;
-extern int w1_max_slave_count;
-extern int w1_max_slave_ttl;
-extern struct list_head w1_masters;
-extern struct mutex w1_mlock;
-
-extern int w1_process(void *);
-
static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
struct device_driver *driver,
struct device *device)
@@ -96,7 +86,7 @@ static struct w1_master * w1_alloc_dev(u
return dev;
}
-void w1_free_dev(struct w1_master *dev)
+static void w1_free_dev(struct w1_master *dev)
{
device_unregister(&dev->dev);
}
> cu
> Adrian
--
Evgeniy Polyakov
next prev parent reply other threads:[~2006-04-04 16:38 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-04 8:45 2.6.17-rc1-mm1 Andrew Morton
2006-04-04 14:31 ` 2.6.17-rc1-mm1 Kumar Gala
2006-04-04 16:02 ` 2.6.17-mm1: drivers/w1/: patch undoes reasonable cleanups Adrian Bunk
2006-04-04 16:35 ` Evgeniy Polyakov [this message]
2006-04-04 16:29 ` 2.6.17-rc1-mm1: KEXEC became SMP-only Adrian Bunk
2006-04-04 17:22 ` Zachary Amsden
2006-04-04 17:50 ` Eric W. Biederman
2006-04-06 22:37 ` Adrian Bunk
2006-04-04 17:43 ` Eric W. Biederman
2006-04-04 17:51 ` Zachary Amsden
2006-04-04 18:43 ` Eric W. Biederman
2006-04-04 19:23 ` Zachary Amsden
2006-04-04 19:38 ` Muli Ben-Yehuda
2006-04-04 20:25 ` Andrew Morton
2006-04-04 22:02 ` Zachary Amsden
2006-04-04 22:19 ` Andrew Morton
2006-04-04 22:34 ` Zachary Amsden
2006-04-04 22:38 ` Andrew Morton
2006-04-05 0:21 ` Martin Bligh
2006-04-05 2:45 ` Eric W. Biederman
2006-04-04 16:29 ` [-mm patch] i386: pre_intr_init_hook optimization Adrian Bunk
2006-04-04 17:16 ` Zachary Amsden
2006-04-04 16:29 ` 2.6.17-rc1-mm1: why did acpi_ns_build_external_path() become global? Adrian Bunk
2006-04-04 16:30 ` [-mm patch] drivers/media/video/bt866.c: small fixes Adrian Bunk
2006-04-04 18:32 ` Martin Samuelsson
2006-04-05 7:42 ` Andrew Morton
2006-04-05 9:02 ` Adrian Bunk
2006-04-05 13:44 ` Martin Samuelsson
2006-04-05 8:32 ` Johannes Stezenbach
2006-04-05 13:54 ` Martin Samuelsson
2006-04-04 16:30 ` [-mm patch] fs/nfsd/nfs4state.c: make a struct static Adrian Bunk
2006-04-04 16:50 ` [NFS] " J. Bruce Fields
2006-04-04 17:29 ` Adrian Bunk
2006-04-04 20:53 ` 2.6.17-rc1-mm1: mlockall() regression on x86_64 Rafael J. Wysocki
2006-04-04 22:24 ` Andrew Morton
2006-04-04 21:53 ` 2.6.17-rc1-mm1 Zan Lynx
2006-04-04 22:09 ` 2.6.17-rc1-mm1 Andrew Morton
2006-04-05 7:01 ` 2.6.17-rc1-mm1 Roger Luethi
2006-04-05 7:29 ` 2.6.17-rc1-mm1 Andrew Morton
2006-04-05 22:01 ` 2.6.17-rc1-mm1 Roger Luethi
2006-04-04 23:38 ` 2.6.17-rc1-mm1 Luck, Tony
2006-04-05 2:05 ` 2.6.17-rc1-mm1 Zou Nan hai
2006-04-05 16:15 ` 2.6.17-rc1-mm1 Bjorn Helgaas
2006-04-05 21:17 ` 2.6.17-rc1-mm1 Luck, Tony
2006-04-05 21:37 ` 2.6.17-rc1-mm1 Andrew Morton
2006-04-05 21:39 ` 2.6.17-rc1-mm1 Andreas Schwab
2006-04-05 22:01 ` 2.6.17-rc1-mm1 Bjorn Helgaas
2006-04-06 1:49 ` 2.6.17-rc1-mm1 Antonino A. Daplas
2006-04-06 10:21 ` 2.6.17-rc1-mm1 Russell King
2006-04-06 10:34 ` 2.6.17-rc1-mm1 Russell King
2006-04-06 14:55 ` 2.6.17-rc1-mm1 Bjorn Helgaas
2006-04-06 10:16 ` 2.6.17-rc1-mm1 Russell King
2006-04-05 2:27 ` 2.6.17-rc1-mm1, nfsd/reiser4 BUG Zan Lynx
2006-04-07 12:27 ` 2.6.17-rc1-mm1: drivers/acpi/numa.c compile error Adrian Bunk
2006-04-07 20:59 ` Andrew Morton
2006-04-09 15:44 ` Adrian Bunk
2006-04-09 15:57 ` Randy.Dunlap
2006-04-07 20:58 ` 2.6.17-rc1-mm1 - detects buggy TSC on GEODE Jim Cromie
2006-04-08 0:07 ` Andrew Morton
2006-04-08 0:25 ` john stultz
2006-04-08 1:15 ` Jim Cromie
2006-04-13 7:39 ` 2.6.17-rc1-mm1 Heiko Carstens
2006-04-13 8:13 ` 2.6.17-rc1-mm1 Andrew Morton
2006-04-14 16:07 ` 2.6.17-rc1-mm1 Alasdair G Kergon
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=20060404163522.GA29486@2ka.mipt.ru \
--to=johnpol@2ka.mipt.ru \
--cc=akpm@osdl.org \
--cc=bunk@stusta.de \
--cc=gregkh@suse.de \
--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;
as well as URLs for NNTP newsgroup(s).