git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert driver core: fix passing platform_data
[safe/jmp/linux-2.6]
/
drivers
/
base
/
isa.c
diff --git
a/drivers/base/isa.c
b/drivers/base/isa.c
index
efd5775
..
91dba65
100644
(file)
--- a/
drivers/base/isa.c
+++ b/
drivers/base/isa.c
@@
-11,7
+11,7
@@
#include <linux/isa.h>
static struct device isa_bus = {
#include <linux/isa.h>
static struct device isa_bus = {
- .
bus_id
= "isa"
+ .
init_name
= "isa"
};
struct isa_dev {
};
struct isa_dev {
@@
-135,14
+135,13
@@
int isa_register_driver(struct isa_driver *isa_driver, unsigned int ndev)
isa_dev->dev.parent = &isa_bus;
isa_dev->dev.bus = &isa_bus_type;
isa_dev->dev.parent = &isa_bus;
isa_dev->dev.bus = &isa_bus_type;
- snprintf(isa_dev->dev.bus_id, BUS_ID_SIZE, "%s.%u",
- isa_driver->driver.name, id);
-
+ dev_set_name(&isa_dev->dev, "%s.%u",
+ isa_driver->driver.name, id);
isa_dev->dev.platform_data = isa_driver;
isa_dev->dev.release = isa_dev_release;
isa_dev->id = id;
isa_dev->dev.platform_data = isa_driver;
isa_dev->dev.release = isa_dev_release;
isa_dev->id = id;
- isa_dev->dev.coherent_dma_mask = DMA_
24BIT_MASK
;
+ isa_dev->dev.coherent_dma_mask = DMA_
BIT_MASK(24)
;
isa_dev->dev.dma_mask = &isa_dev->dev.coherent_dma_mask;
error = device_register(&isa_dev->dev);
isa_dev->dev.dma_mask = &isa_dev->dev.coherent_dma_mask;
error = device_register(&isa_dev->dev);