diff options
Diffstat (limited to 'drivers/mmc/mmc_sysfs.c')
| -rw-r--r-- | drivers/mmc/mmc_sysfs.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/mmc_sysfs.c index ad8949810fc5..3f4a66ca9555 100644 --- a/drivers/mmc/mmc_sysfs.c +++ b/drivers/mmc/mmc_sysfs.c | |||
| @@ -34,6 +34,7 @@ MMC_ATTR(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1], | |||
| 34 | card->raw_cid[2], card->raw_cid[3]); | 34 | card->raw_cid[2], card->raw_cid[3]); |
| 35 | MMC_ATTR(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1], | 35 | MMC_ATTR(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1], |
| 36 | card->raw_csd[2], card->raw_csd[3]); | 36 | card->raw_csd[2], card->raw_csd[3]); |
| 37 | MMC_ATTR(scr, "%08x%08x\n", card->raw_scr[0], card->raw_scr[1]); | ||
| 37 | MMC_ATTR(date, "%02d/%04d\n", card->cid.month, card->cid.year); | 38 | MMC_ATTR(date, "%02d/%04d\n", card->cid.month, card->cid.year); |
| 38 | MMC_ATTR(fwrev, "0x%x\n", card->cid.fwrev); | 39 | MMC_ATTR(fwrev, "0x%x\n", card->cid.fwrev); |
| 39 | MMC_ATTR(hwrev, "0x%x\n", card->cid.hwrev); | 40 | MMC_ATTR(hwrev, "0x%x\n", card->cid.hwrev); |
| @@ -57,6 +58,8 @@ static struct device_attribute mmc_dev_attrs[] = { | |||
| 57 | __ATTR_NULL | 58 | __ATTR_NULL |
| 58 | }; | 59 | }; |
| 59 | 60 | ||
| 61 | static struct device_attribute mmc_dev_attr_scr = MMC_ATTR_RO(scr); | ||
| 62 | |||
| 60 | 63 | ||
| 61 | static void mmc_release_card(struct device *dev) | 64 | static void mmc_release_card(struct device *dev) |
| 62 | { | 65 | { |
| @@ -207,10 +210,20 @@ void mmc_init_card(struct mmc_card *card, struct mmc_host *host) | |||
| 207 | */ | 210 | */ |
| 208 | int mmc_register_card(struct mmc_card *card) | 211 | int mmc_register_card(struct mmc_card *card) |
| 209 | { | 212 | { |
| 213 | int ret; | ||
| 214 | |||
| 210 | snprintf(card->dev.bus_id, sizeof(card->dev.bus_id), | 215 | snprintf(card->dev.bus_id, sizeof(card->dev.bus_id), |
| 211 | "%s:%04x", mmc_hostname(card->host), card->rca); | 216 | "%s:%04x", mmc_hostname(card->host), card->rca); |
| 212 | 217 | ||
| 213 | return device_add(&card->dev); | 218 | ret = device_add(&card->dev); |
| 219 | if (ret == 0) { | ||
| 220 | if (mmc_card_sd(card)) { | ||
| 221 | ret = device_create_file(&card->dev, &mmc_dev_attr_scr); | ||
| 222 | if (ret) | ||
| 223 | device_del(&card->dev); | ||
| 224 | } | ||
| 225 | } | ||
| 226 | return ret; | ||
| 214 | } | 227 | } |
| 215 | 228 | ||
| 216 | /* | 229 | /* |
| @@ -219,8 +232,12 @@ int mmc_register_card(struct mmc_card *card) | |||
| 219 | */ | 232 | */ |
| 220 | void mmc_remove_card(struct mmc_card *card) | 233 | void mmc_remove_card(struct mmc_card *card) |
| 221 | { | 234 | { |
| 222 | if (mmc_card_present(card)) | 235 | if (mmc_card_present(card)) { |
| 236 | if (mmc_card_sd(card)) | ||
| 237 | device_remove_file(&card->dev, &mmc_dev_attr_scr); | ||
| 238 | |||
| 223 | device_del(&card->dev); | 239 | device_del(&card->dev); |
| 240 | } | ||
| 224 | 241 | ||
| 225 | put_device(&card->dev); | 242 | put_device(&card->dev); |
| 226 | } | 243 | } |
