diff for duplicates of <4C8CCCE8.3030209@arndnet.de> diff --git a/a/1.txt b/N1/1.txt index ce13cb5..a9e1bff 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,14 +26,11 @@ Arnd >> : 1; } >> >> +static int tmio_mmc_get_cd(struct mmc_host *mmc) +{ + struct ->> tmio_mmc_host *host = mmc_priv(mmc); + struct mfd_cell *cell = ->> host->pdev->dev.platform_data; + struct tmio_mmc_data *pdata = ->> cell->driver_data; + + if (!pdata->get_cd) + return -ENOSYS; + +>> tmio_mmc_host *host = mmc_priv(mmc); + struct mfd_cell *cell >> host->pdev->dev.platform_data; + struct tmio_mmc_data *pdata >> cell->driver_data; + + if (!pdata->get_cd) + return -ENOSYS; + >> else + return pdata->get_cd(host->pdev); +} + static const struct >> mmc_host_ops tmio_mmc_ops = { .request = tmio_mmc_request, .set_ios >> = tmio_mmc_set_ios, .get_ro = tmio_mmc_get_ro, + .get_cd - = ->> tmio_mmc_get_cd, }; + >> tmio_mmc_get_cd, }; >> >> #ifdef CONFIG_PM diff --git a/include/linux/mfd/tmio.h >> b/include/linux/mfd/tmio.h index f07425b..24c43bb 100644 --- diff --git a/a/content_digest b/N1/content_digest index d5613d3..dd24178 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,8 @@ "ref\01282663622-20564-2-git-send-email-arnd@arndnet.de\0" "ref\020100910161019.GM2561@sortiz-mobl\0" "From\0Arnd Hannemann <arnd@arndnet.de>\0" - "Subject\0Re: [PATCH 1/4] tmio_mmc: Allow the mfd driver to specify get_cd handler\0" - "Date\0Sun, 12 Sep 2010 14:51:52 +0200\0" + "Subject\0Re: [PATCH 1/4] tmio_mmc: Allow the mfd driver to specify get_cd\0" + "Date\0Sun, 12 Sep 2010 12:51:52 +0000\0" "To\0Samuel Ortiz <sameo@linux.intel.com>\0" "Cc\0ian@mnementh.co.uk" linux-mmc@vger.kernel.org @@ -39,14 +39,11 @@ ">> : 1; }\n" ">>\n" ">> +static int tmio_mmc_get_cd(struct mmc_host *mmc) +{ + struct\n" - ">> tmio_mmc_host *host = mmc_priv(mmc); + struct mfd_cell *cell =\n" - ">> host->pdev->dev.platform_data; + struct tmio_mmc_data *pdata =\n" - ">> cell->driver_data; + + if (!pdata->get_cd) + return -ENOSYS; +\n" + ">> tmio_mmc_host *host = mmc_priv(mmc); + struct mfd_cell *cell >> host->pdev->dev.platform_data; + struct tmio_mmc_data *pdata >> cell->driver_data; + + if (!pdata->get_cd) + return -ENOSYS; +\n" ">> else + return pdata->get_cd(host->pdev); +} + static const struct\n" ">> mmc_host_ops tmio_mmc_ops = { .request = tmio_mmc_request, .set_ios\n" ">> = tmio_mmc_set_ios, .get_ro = tmio_mmc_get_ro, + .get_cd \n" - " =\n" - ">> tmio_mmc_get_cd, };\n" + " >> tmio_mmc_get_cd, };\n" ">>\n" ">> #ifdef CONFIG_PM diff --git a/include/linux/mfd/tmio.h\n" ">> b/include/linux/mfd/tmio.h index f07425b..24c43bb 100644 ---\n" @@ -60,4 +57,4 @@ ">>\n" > -2fa5fa13c07af551683dfaaa7acefa42cb2fb3de7aa6cd27c50242192e00a477 +ee0a7659430c9e2e2cac4a013e9f90dc81b619d2efff9206548eddab9d6d744a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.