diff options
| author | Doug Anderson <dianders@chromium.org> | 2013-01-11 17:03:54 +0000 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-02-24 14:36:55 -0500 |
| commit | 9640639b09313af4cd37a465408643aba927808e (patch) | |
| tree | ade7322a8c829279beed48a6d7281279736391d4 /drivers/mmc | |
| parent | 55a6ceb2d5b845f198bcd76aa18910e05a47d0c2 (diff) | |
| download | linux-9640639b09313af4cd37a465408643aba927808e.tar.bz2 | |
mmc: dw_mmc: Remove DW_MCI_QUIRK_NO_WRITE_PROTECT
The original quirk was added in the change 'mmc: dw_mmc: add quirk to
indicate missing write protect line'. The original quirk was added at
a controller level even though each slot has its own write protect (so
the quirk should be at the slot level). A recent change (mmc: dw_mmc:
Add "disable-wp" device tree property) added a slot-level quirk and
support for the quirk directly to dw_mmc.
Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Will Newton <will.newton@imgtec.com>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/dw_mmc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index df6207909fe7..60063ccb4c4b 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -831,13 +831,7 @@ static int dw_mci_get_ro(struct mmc_host *mmc) struct dw_mci_board *brd = slot->host->pdata; /* Use platform get_ro function, else try on board write protect */ - - /* - * NOTE: DW_MCI_QUIRK_NO_WRITE_PROTECT will be removed in a future - * patch in the series once reference to it is removed. - */ - if ((brd->quirks & DW_MCI_QUIRK_NO_WRITE_PROTECT) || - (slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT)) + if (slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT) read_only = 0; else if (brd->get_ro) read_only = brd->get_ro(slot->id); |