leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

component: remove old add_components method

Browse Source 
Now that drivers create an array of component matches at probe time, we
can retire the old methods.  This involves removing the add_components
master method, and removing component_master_add_child() from public
view.  We also remove component_add_master() as that interface is no
longer useful.

Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2014-04-18 22:10:32 +01:00
parent 8005c49d9a
commit fae9e2e07a
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/base/component.c
View File

@ -84,7 +84,7 @@ static void component_detach_master(struct master *master, struct component *c)
* function and compare data. This is safe to call for duplicate matches * function and compare data. This is safe to call for duplicate matches
* and will not result in the same component being added multiple times. * and will not result in the same component being added multiple times.
*/ */
int component_master_add_child(struct master *master, static int component_master_add_child(struct master *master,
int (*compare)(struct device *, void *), void *compare_data) int (*compare)(struct device *, void *), void *compare_data)
{ {
struct component *c; struct component *c;
@ -104,7 +104,6 @@ int component_master_add_child(struct master *master,
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(component_master_add_child);
static int find_components(struct master *master) static int find_components(struct master *master)
{ {
@ -112,14 +111,6 @@ static int find_components(struct master *master)
size_t i; size_t i;
int ret = 0; int ret = 0;
if (!match) {
/*
* Search the list of components, looking for components that
* belong to this master, and attach them to the master.
*/
return master->ops->add_components(master->dev, master);
}
/* /*
* Scan the array of match functions and attach * Scan the array of match functions and attach
* any components which are found to this master. * any components which are found to this master.
@ -290,15 +281,10 @@ int component_master_add_with_match(struct device *dev,
struct master *master; struct master *master;
int ret; int ret;
if (ops->add_components && match) /* Reallocate the match array for its true size */
return -EINVAL; match = component_match_realloc(dev, match, match->num);
if (IS_ERR(match))
if (match) { return PTR_ERR(match);
/* Reallocate the match array for its true size */
match = component_match_realloc(dev, match, match->num);
if (IS_ERR(match))
return PTR_ERR(match);
}
master = kzalloc(sizeof(*master), GFP_KERNEL); master = kzalloc(sizeof(*master), GFP_KERNEL);
if (!master) if (!master)
@ -326,13 +312,6 @@ int component_master_add_with_match(struct device *dev,
} }
EXPORT_SYMBOL_GPL(component_master_add_with_match); EXPORT_SYMBOL_GPL(component_master_add_with_match);
int component_master_add(struct device *dev,
const struct component_master_ops *ops)
{
return component_master_add_with_match(dev, ops, NULL);
}
EXPORT_SYMBOL_GPL(component_master_add);
void component_master_del(struct device *dev, void component_master_del(struct device *dev,
const struct component_master_ops *ops) const struct component_master_ops *ops)
{ {

5
include/linux/component.h
View File

@ -17,18 +17,13 @@ void component_unbind_all(struct device *, void *);
struct master; struct master;
struct component_master_ops { struct component_master_ops {
int (*add_components)(struct device *, struct master *);
int (*bind)(struct device *); int (*bind)(struct device *);
void (*unbind)(struct device *); void (*unbind)(struct device *);
}; };
int component_master_add(struct device *, const struct component_master_ops *);
void component_master_del(struct device *, void component_master_del(struct device *,
const struct component_master_ops *); const struct component_master_ops *);
int component_master_add_child(struct master *master,
int (*compare)(struct device *, void *), void *compare_data);
struct component_match; struct component_match;
int component_master_add_with_match(struct device *, int component_master_add_with_match(struct device *,