git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
drivers
/
macintosh
/
macio_asic.c
diff --git
a/drivers/macintosh/macio_asic.c
b/drivers/macintosh/macio_asic.c
index
26a303a
..
9714780
100644
(file)
--- a/
drivers/macintosh/macio_asic.c
+++ b/
drivers/macintosh/macio_asic.c
@@
-39,14
+39,12
@@
static struct macio_chip *macio_on_hold;
static int macio_bus_match(struct device *dev, struct device_driver *drv)
{
static int macio_bus_match(struct device *dev, struct device_driver *drv)
{
- struct macio_dev * macio_dev = to_macio_device(dev);
- struct macio_driver * macio_drv = to_macio_driver(drv);
- const struct of_device_id * matches = macio_drv->match_table;
+ const struct of_device_id * matches = drv->of_match_table;
if (!matches)
return 0;
if (!matches)
return 0;
- return of_match_device(matches,
&macio_dev->of
dev) != NULL;
+ return of_match_device(matches, dev) != NULL;
}
struct macio_dev *macio_dev_get(struct macio_dev *dev)
}
struct macio_dev *macio_dev_get(struct macio_dev *dev)
@@
-84,7
+82,7
@@
static int macio_device_probe(struct device *dev)
macio_dev_get(macio_dev);
macio_dev_get(macio_dev);
- match = of_match_device(drv->
match_table, &macio_dev->of
dev);
+ match = of_match_device(drv->
driver.of_match_table,
dev);
if (match)
error = drv->probe(macio_dev, match);
if (error)
if (match)
error = drv->probe(macio_dev, match);
if (error)
@@
-248,7
+246,7
@@
static void macio_create_fixup_irq(struct macio_dev *dev, int index,
static void macio_add_missing_resources(struct macio_dev *dev)
{
static void macio_add_missing_resources(struct macio_dev *dev)
{
- struct device_node *np = dev->ofdev.node;
+ struct device_node *np = dev->ofdev.
dev.of_
node;
unsigned int irq_base;
/* Gatwick has some missing interrupts on child nodes */
unsigned int irq_base;
/* Gatwick has some missing interrupts on child nodes */
@@
-289,7
+287,7
@@
static void macio_add_missing_resources(struct macio_dev *dev)
static void macio_setup_interrupts(struct macio_dev *dev)
{
static void macio_setup_interrupts(struct macio_dev *dev)
{
- struct device_node *np = dev->ofdev.node;
+ struct device_node *np = dev->ofdev.
dev.of_
node;
unsigned int irq;
int i = 0, j = 0;
unsigned int irq;
int i = 0, j = 0;
@@
-317,7
+315,7
@@
static void macio_setup_interrupts(struct macio_dev *dev)
static void macio_setup_resources(struct macio_dev *dev,
struct resource *parent_res)
{
static void macio_setup_resources(struct macio_dev *dev,
struct resource *parent_res)
{
- struct device_node *np = dev->ofdev.node;
+ struct device_node *np = dev->ofdev.
dev.of_
node;
struct resource r;
int index;
struct resource r;
int index;
@@
-373,9
+371,9
@@
static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
dev->bus = &chip->lbus;
dev->media_bay = in_bay;
dev->bus = &chip->lbus;
dev->media_bay = in_bay;
- dev->ofdev.node = np;
- dev->ofdev.dma_mask = 0xffffffffUL;
- dev->ofdev.dev.dma_mask = &dev->ofdev.dma_mask;
+ dev->ofdev.
dev.of_
node = np;
+ dev->ofdev.
archdata.
dma_mask = 0xffffffffUL;
+ dev->ofdev.dev.dma_mask = &dev->ofdev.
archdata.
dma_mask;
dev->ofdev.dev.parent = parent;
dev->ofdev.dev.bus = &macio_bus_type;
dev->ofdev.dev.release = macio_release_dev;
dev->ofdev.dev.parent = parent;
dev->ofdev.dev.bus = &macio_bus_type;
dev->ofdev.dev.release = macio_release_dev;
@@
-494,9
+492,9
@@
static void macio_pci_add_devices(struct macio_chip *chip)
}
/* Add media bay devices if any */
}
/* Add media bay devices if any */
+ pnode = mbdev->ofdev.dev.of_node;
if (mbdev)
if (mbdev)
- for (np = NULL; (np = of_get_next_child(mbdev->ofdev.node, np))
- != NULL;) {
+ for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) {
if (macio_skip_device(np))
continue;
of_node_get(np);
if (macio_skip_device(np))
continue;
of_node_get(np);
@@
-506,9
+504,9
@@
static void macio_pci_add_devices(struct macio_chip *chip)
}
/* Add serial ports if any */
}
/* Add serial ports if any */
+ pnode = sdev->ofdev.dev.of_node;
if (sdev) {
if (sdev) {
- for (np = NULL; (np = of_get_next_child(sdev->ofdev.node, np))
- != NULL;) {
+ for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) {
if (macio_skip_device(np))
continue;
of_node_get(np);
if (macio_skip_device(np))
continue;
of_node_get(np);