diff options
Diffstat (limited to 'drivers/mcb/mcb-parse.c')
-rw-r--r-- | drivers/mcb/mcb-parse.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/mcb/mcb-parse.c b/drivers/mcb/mcb-parse.c index 004926955263..dbecbed0d258 100644 --- a/drivers/mcb/mcb-parse.c +++ b/drivers/mcb/mcb-parse.c | |||
@@ -57,7 +57,7 @@ static int chameleon_parse_gdd(struct mcb_bus *bus, | |||
57 | mdev->id = GDD_DEV(reg1); | 57 | mdev->id = GDD_DEV(reg1); |
58 | mdev->rev = GDD_REV(reg1); | 58 | mdev->rev = GDD_REV(reg1); |
59 | mdev->var = GDD_VAR(reg1); | 59 | mdev->var = GDD_VAR(reg1); |
60 | mdev->bar = GDD_BAR(reg1); | 60 | mdev->bar = GDD_BAR(reg2); |
61 | mdev->group = GDD_GRP(reg2); | 61 | mdev->group = GDD_GRP(reg2); |
62 | mdev->inst = GDD_INS(reg2); | 62 | mdev->inst = GDD_INS(reg2); |
63 | 63 | ||
@@ -113,16 +113,11 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase, | |||
113 | } | 113 | } |
114 | p += hsize; | 114 | p += hsize; |
115 | 115 | ||
116 | pr_debug("header->revision = %d\n", header->revision); | 116 | bus->revision = header->revision; |
117 | pr_debug("header->model = 0x%x ('%c')\n", header->model, | 117 | bus->model = header->model; |
118 | header->model); | 118 | bus->minor = header->minor; |
119 | pr_debug("header->minor = %d\n", header->minor); | 119 | snprintf(bus->name, CHAMELEON_FILENAME_LEN + 1, "%s", |
120 | pr_debug("header->bus_type = 0x%x\n", header->bus_type); | 120 | header->filename); |
121 | |||
122 | |||
123 | pr_debug("header->magic = 0x%x\n", header->magic); | ||
124 | pr_debug("header->filename = \"%.*s\"\n", CHAMELEON_FILENAME_LEN, | ||
125 | header->filename); | ||
126 | 121 | ||
127 | for_each_chameleon_cell(dtype, p) { | 122 | for_each_chameleon_cell(dtype, p) { |
128 | switch (dtype) { | 123 | switch (dtype) { |