diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-08-17 05:38:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-08-17 05:38:09 -0700 |
| commit | db71a5a2b63a176d45ea5130bbbca73eb7ead15d (patch) | |
| tree | 12296ee457bb780cc071c35ecd956e28cefa78e7 | |
| parent | db82f17d8a71a073f8c3f049bcac4fa668f68088 (diff) | |
More EISA/MCA fixups for removal of 'name' member in device struct.
| -rw-r--r-- | drivers/eisa/virtual_root.c | 3 | ||||
| -rw-r--r-- | drivers/mca/mca-proc.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/eisa/virtual_root.c b/drivers/eisa/virtual_root.c index 3c384ccfe489..95ffab9ac17d 100644 --- a/drivers/eisa/virtual_root.c +++ b/drivers/eisa/virtual_root.c @@ -29,9 +29,6 @@ static int force_probe = EISA_FORCE_PROBE_DEFAULT; static struct platform_device eisa_root_dev = { .name = "eisa", .id = 0, - .dev = { - .name = "Virtual EISA Bridge", - }, }; static struct eisa_root_device eisa_bus_root = { diff --git a/drivers/mca/mca-proc.c b/drivers/mca/mca-proc.c index 0433449684cf..21399d12ec0e 100644 --- a/drivers/mca/mca-proc.c +++ b/drivers/mca/mca-proc.c @@ -39,7 +39,7 @@ static int get_mca_info_helper(struct mca_device *mca_dev, char *page, int len) for(j=0; j<8; j++) len += sprintf(page+len, "%02x ", mca_dev ? mca_dev->pos[j] : 0xff); - len += sprintf(page+len, " %s\n", mca_dev ? mca_dev->dev.name : ""); + len += sprintf(page+len, " %s\n", mca_dev ? mca_dev->name : ""); return len; } @@ -108,12 +108,12 @@ static int mca_default_procfn(char* buf, struct mca_device *mca_dev) } else if(slot == MCA_MOTHERBOARD) { len += sprintf(buf+len, "Motherboard\n"); } - if(mca_dev->dev.name[0]) { + if (mca_dev->name[0]) { /* Drivers might register a name without /proc handler... */ len += sprintf(buf+len, "Adapter Name: %s\n", - mca_dev->dev.name); + mca_dev->name); } else { len += sprintf(buf+len, "Adapter Name: Unknown\n"); } |