From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 09/75] Driver core: remove subsys_get()
Date: Fri, 12 Oct 2007 15:16:13 -0700 [thread overview]
Message-ID: <1192227481691-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <11922274772578-git-send-email-gregkh@suse.de>
There are no more subsystems, it's a kset now so remove the function and
the only two users, which are in the driver core.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/base/bus.c | 2 +-
drivers/base/class.c | 2 +-
include/linux/kobject.h | 7 -------
lib/kobject.c | 2 +-
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 2f77593..bc38085 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -728,7 +728,7 @@ EXPORT_SYMBOL_GPL(device_reprobe);
struct bus_type *get_bus(struct bus_type *bus)
{
- return bus ? container_of(subsys_get(&bus->subsys),
+ return bus ? container_of(kset_get(&bus->subsys),
struct bus_type, subsys) : NULL;
}
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 50e3413..3e9b04c 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -93,7 +93,7 @@ void class_remove_file(struct class * cls, const struct class_attribute * attr)
static struct class *class_get(struct class *cls)
{
if (cls)
- return container_of(subsys_get(&cls->subsys), struct class, subsys);
+ return container_of(kset_get(&cls->subsys), struct class, subsys);
return NULL;
}
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 45effed..c0fb535 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -231,13 +231,6 @@ extern void subsystem_init(struct kset *);
extern int __must_check subsystem_register(struct kset *);
extern void subsystem_unregister(struct kset *);
-static inline struct kset *subsys_get(struct kset *s)
-{
- if (s)
- return kset_get(s);
- return NULL;
-}
-
struct subsys_attribute {
struct attribute attr;
ssize_t (*show)(struct kset *, char *);
diff --git a/lib/kobject.c b/lib/kobject.c
index 0aa4e90..1326041 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -679,7 +679,7 @@ int subsys_create_file(struct kset *s, struct subsys_attribute *a)
if (!s || !a)
return -EINVAL;
- if (subsys_get(s)) {
+ if (kset_get(s)) {
error = sysfs_create_file(&s->kobj, &a->attr);
kset_put(s);
}
--
1.5.3.4
next prev parent reply other threads:[~2007-10-12 22:22 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20071012221251.GB4559@kroah.com\>
2007-10-12 22:16 ` [PATCH 01/75] platform: prefix MODALIAS with "platform:" Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 02/75] HOWTO: update ja_JP/HOWTO with latest changes Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 03/75] Driver core: make sysfs uevent-attributes static Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 04/75] Driver core: change add_uevent_var to use a struct Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 05/75] Driver core: add CONFIG_UEVENT_HELPER_PATH Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 06/75] Driver core: remove subsys_set_kset Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 07/75] Driver core: remove kset_set_kset_s Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 08/75] Driver core: remove subsys_put() Greg Kroah-Hartman
2007-10-12 22:16 ` Greg Kroah-Hartman [this message]
2007-10-12 22:16 ` [PATCH 10/75] Driver core: remove put_bus() Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 11/75] Driver core: remove get_bus() Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 12/75] kobjects: fix up improper use of the kobject name field Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 13/75] cdev: remove unneeded setting of cdev names Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 14/75] Drivers: clean up direct setting of the name of a kset Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 15/75] kobject: remove the static array for the name Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 16/75] Driver core: clean up removed functions from the documentation Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 17/75] debugfs: helper for decimal challenged Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 18/75] sysfs/file.c - use mutex instead of semaphore Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 19/75] sysfs: cleanup semaphore.h Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 20/75] sysfs: Remove first pass at shadow directory support Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 21/75] sysfs: cosmetic changes in sysfs_lookup() Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 22/75] sysfs: simplify sysfs_rename_dir() Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 23/75] sysfs: make sysfs_add/remove_one() call link/unlink_sibling() implictly Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 24/75] sysfs: make sysfs_add_one() automatically check for duplicate entry Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 25/75] sysfs: make sysfs_addrm_finish() return void Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 26/75] dmi-id: Use dynamic sysfs attributes Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 27/75] dmi-id: Possible cleanup Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 28/75] Convert from class_device to device for drivers/video Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 29/75] Convert from class_device to device in drivers/char Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 30/75] Driver core: exclude kobject_uevent.c for !CONFIG_HOTPLUG Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 31/75] Driver core: add uevent file for bus and driver Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 32/75] Driver core: kerneldoc - kobject_uevent_env is not "usually KOBJ_MOVE" Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 33/75] Fix Firmware class name collision Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 34/75] drivers/base/power/: make 2 functions static Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 35/75] sysfs: Fix typos in fs/sysfs/file.c Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 36/75] sysdev: remove global sysdev drivers list Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 37/75] Driver core: Make platform_device.id an int Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 38/75] sysfs: fix i_mutex locking in sysfs_get_dentry() Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 39/75] sysfs: Move all of inode initialization into sysfs_init_inode Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 40/75] sysfs: Remove sysfs_instantiate Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 41/75] sysfs: Use kill_anon_super Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 42/75] sysfs: Make sysfs_mount static Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 43/75] sysfs: In sysfs_lookup don't open code sysfs_find_dirent Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 44/75] sysfs: Simplify readdir Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 45/75] sysfs: Rewrite sysfs_drop_dentry Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 46/75] sysfs: Introduce sysfs_rename_mutex Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 47/75] sysfs: simply sysfs_get_dentry Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 48/75] sysfs: Remove s_dentry Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 49/75] sysfs: Rewrite rename in terms of sysfs dirents Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 50/75] sysfs: Rewrite sysfs_move_dir " Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 51/75] PTY: add kernel parameter to overwrite legacy pty count Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 52/75] sysfs: spit a warning to users when they try to create a duplicate sysfs file Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 53/75] sysfs: fix comments of sysfs_add/remove_one() Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 54/75] sysfs: fix sysfs_chmod_file() such that it updates sd->s_mode too Greg Kroah-Hartman
2007-10-12 22:16 ` [PATCH 55/75] sysfs: clean up header files Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 56/75] sysfs: kill sysfs_update_file() Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 57/75] sysfs: reposition sysfs_dirent->s_mode Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 58/75] sysfs: kill unnecessary sysfs_get() in open paths Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 59/75] sysfs: kill unnecessary NULL pointer check in sysfs_release() Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 60/75] sysfs: make bin attr open get active reference of parent too Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 61/75] sysfs: make s_elem an anonymous union Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 62/75] sysfs: open code sysfs_attach_dentry() Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 63/75] sysfs: make sysfs_root a regular directory dirent Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 64/75] sysfs: move sysfs_dirent->s_children into sysfs_dirent->s_dir Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 65/75] sysfs: implement sysfs_open_dirent Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 66/75] sysfs: move sysfs file poll implementation to sysfs_open_dirent Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 67/75] driver core: remove subsystem_init() Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 68/75] Driver core: rename ktype_class Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 69/75] Driver core: rename ktype_device Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 70/75] Driver core: rename ktype_driver Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 71/75] Driver core: rename ktype_edd and ktype_efivar Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 72/75] kset: add some kerneldoc to help describe what these strange things are Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 73/75] kobject: update the copyrights Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 74/75] sysfs: add copyrights Greg Kroah-Hartman
2007-10-12 22:17 ` [PATCH 75/75] PM: merge device power-management source files Greg Kroah-Hartman
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=1192227481691-git-send-email-gregkh@suse.de \
--to=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).