diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-10 14:51:08 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-15 09:48:03 +0200 |
| commit | 31c88a6929778bf4dd2f1b1ef898dc3542a29949 (patch) | |
| tree | 692436b142f79c79967814131a9ff932e5ed29b7 | |
| parent | b7a3e559158af9c18a30d260f37aa0e4c6525cbc (diff) | |
| download | barebox-31c88a6929778bf4dd2f1b1ef898dc3542a29949.tar.gz barebox-31c88a6929778bf4dd2f1b1ef898dc3542a29949.tar.xz | |
mci: embed mci_dev into mci_host instead of allocating it seperately
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/mci/mci-core.c | 4 | ||||
| -rw-r--r-- | include/mci.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index fea26916c6..6a29619882 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -1359,9 +1359,7 @@ device_initcall(mci_init); */ int mci_register(struct mci_host *host) { - struct device_d *mci_dev; - - mci_dev = xzalloc(sizeof(struct device_d)); + struct device_d *mci_dev = &host->dev; strcpy(mci_dev->name, mci_driver.name); mci_dev->platform_data = (void*)host; diff --git a/include/mci.h b/include/mci.h index 8c669ca0af..69cffe8d3f 100644 --- a/include/mci.h +++ b/include/mci.h @@ -194,6 +194,7 @@ struct mci_data { /** host information */ struct mci_host { struct device_d *hw_dev; /**< the host MCI hardware device */ + struct device_d dev; /**< our device */ unsigned voltages; unsigned host_caps; /**< Host's interface capabilities, refer MMC_VDD_* */ unsigned f_min; /**< host interface lower limit */ |