projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
of: Remove duplicate fields from of_platform_driver
[deliverable/linux.git]
/
drivers
/
of
/
platform.c
diff --git
a/drivers/of/platform.c
b/drivers/of/platform.c
index d58ade170c4b27fd50bf5abc471eac618c4eea3e..ba402c613ede23e5133229d1d0cc22332f00cb50 100644
(file)
--- a/
drivers/of/platform.c
+++ b/
drivers/of/platform.c
@@
-22,8
+22,7
@@
extern struct device_attribute of_platform_device_attrs[];
static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
{
struct of_device *of_dev = to_of_device(dev);
static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
{
struct of_device *of_dev = to_of_device(dev);
- struct of_platform_driver *of_drv = to_of_platform_driver(drv);
- const struct of_device_id *matches = of_drv->match_table;
+ const struct of_device_id *matches = drv->of_match_table;
if (!matches)
return 0;
if (!matches)
return 0;
@@
-46,7
+45,7
@@
static int of_platform_device_probe(struct device *dev)
of_dev_get(of_dev);
of_dev_get(of_dev);
- match = of_match_device(drv->match_table, of_dev);
+ match = of_match_device(drv->
driver.of_
match_table, of_dev);
if (match)
error = drv->probe(of_dev, match);
if (error)
if (match)
error = drv->probe(of_dev, match);
if (error)
@@
-386,11
+385,6
@@
int of_bus_type_init(struct bus_type *bus, const char *name)
int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
{
int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
{
- /* initialize common driver fields */
- if (!drv->driver.name)
- drv->driver.name = drv->name;
- if (!drv->driver.owner)
- drv->driver.owner = drv->owner;
drv->driver.bus = bus;
/* register with core */
drv->driver.bus = bus;
/* register with core */
This page took
0.023883 seconds
and
5
git commands to generate.