From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> To: linux-mmc@vger.kernel.org Cc: linux-sh@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com> Subject: [PATCH 6/7] mmc: sdhi: do not install dummy callbacks Date: Tue, 24 Apr 2012 16:41:46 +0000 [thread overview] Message-ID: <1335285707-22707-7-git-send-email-g.liakhovetski@gmx.de> (raw) In-Reply-To: <1335285707-22707-1-git-send-email-g.liakhovetski@gmx.de> Currently the SDHI glue for the TMIO MMC driver installs dummy .get_cd() and .set_pwr() callbacks even if the platform didn't supply them. This is not necessary, since the TMIO MMC driver itself checks for NULL callbacks. This is also dubious if the platform provides a regulator for SD-card power switching. It is better to only install those callbacks, if they are really provided by the platform. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Magnus Damm <magnus.damm@gmail.com> --- drivers/mmc/host/sh_mobile_sdhi.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index a746ae8..ae2e3da 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -64,18 +64,14 @@ static void sh_mobile_sdhi_set_pwr(struct platform_device *pdev, int state) { struct sh_mobile_sdhi_info *p = pdev->dev.platform_data; - if (p && p->set_pwr) - p->set_pwr(pdev, state); + p->set_pwr(pdev, state); } static int sh_mobile_sdhi_get_cd(struct platform_device *pdev) { struct sh_mobile_sdhi_info *p = pdev->dev.platform_data; - if (p && p->get_cd) - return p->get_cd(pdev); - else - return -ENOSYS; + return p->get_cd(pdev); } static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host) @@ -151,8 +147,10 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev) goto eclkget; } - mmc_data->set_pwr = sh_mobile_sdhi_set_pwr; - mmc_data->get_cd = sh_mobile_sdhi_get_cd; + if (p->set_pwr) + mmc_data->set_pwr = sh_mobile_sdhi_set_pwr; + if (p->get_cd) + mmc_data->get_cd = sh_mobile_sdhi_get_cd; mmc_data->clk_enable = sh_mobile_sdhi_clk_enable; mmc_data->clk_disable = sh_mobile_sdhi_clk_disable; mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED; -- 1.7.2.5
WARNING: multiple messages have this Message-ID (diff)
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> To: linux-mmc@vger.kernel.org Cc: linux-sh@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com> Subject: [PATCH 6/7] mmc: sdhi: do not install dummy callbacks Date: Tue, 24 Apr 2012 18:41:46 +0200 [thread overview] Message-ID: <1335285707-22707-7-git-send-email-g.liakhovetski@gmx.de> (raw) In-Reply-To: <1335285707-22707-1-git-send-email-g.liakhovetski@gmx.de> Currently the SDHI glue for the TMIO MMC driver installs dummy .get_cd() and .set_pwr() callbacks even if the platform didn't supply them. This is not necessary, since the TMIO MMC driver itself checks for NULL callbacks. This is also dubious if the platform provides a regulator for SD-card power switching. It is better to only install those callbacks, if they are really provided by the platform. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Magnus Damm <magnus.damm@gmail.com> --- drivers/mmc/host/sh_mobile_sdhi.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index a746ae8..ae2e3da 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -64,18 +64,14 @@ static void sh_mobile_sdhi_set_pwr(struct platform_device *pdev, int state) { struct sh_mobile_sdhi_info *p = pdev->dev.platform_data; - if (p && p->set_pwr) - p->set_pwr(pdev, state); + p->set_pwr(pdev, state); } static int sh_mobile_sdhi_get_cd(struct platform_device *pdev) { struct sh_mobile_sdhi_info *p = pdev->dev.platform_data; - if (p && p->get_cd) - return p->get_cd(pdev); - else - return -ENOSYS; + return p->get_cd(pdev); } static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host) @@ -151,8 +147,10 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev) goto eclkget; } - mmc_data->set_pwr = sh_mobile_sdhi_set_pwr; - mmc_data->get_cd = sh_mobile_sdhi_get_cd; + if (p->set_pwr) + mmc_data->set_pwr = sh_mobile_sdhi_set_pwr; + if (p->get_cd) + mmc_data->get_cd = sh_mobile_sdhi_get_cd; mmc_data->clk_enable = sh_mobile_sdhi_clk_enable; mmc_data->clk_disable = sh_mobile_sdhi_clk_disable; mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED; -- 1.7.2.5
next prev parent reply other threads:[~2012-04-24 16:41 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-04-24 16:41 [PATCH/RFC 0/7] mmc: tmio: regulator support, clock management, convert ecovec Guennadi Liakhovetski 2012-04-24 16:41 ` Guennadi Liakhovetski 2012-04-24 16:41 ` [PATCH 1/7] mmc: tmio: stop interface clock before runtime PM suspending Guennadi Liakhovetski 2012-04-24 16:41 ` Guennadi Liakhovetski 2012-04-24 16:41 ` [PATCH 2/7] mmc: tmio: don't needlessly enable interrupts during probing Guennadi Liakhovetski 2012-04-24 16:41 ` Guennadi Liakhovetski 2012-04-24 16:41 ` [PATCH 3/7] mmc: tmio: add callbacks to enable-update and disable the interface clock Guennadi Liakhovetski 2012-04-24 16:41 ` Guennadi Liakhovetski 2012-04-24 16:41 ` [PATCH 4/7] mmc: sdhi: implement tmio-mmc clock enable-update and disable callbacks Guennadi Liakhovetski 2012-04-24 16:41 ` Guennadi Liakhovetski 2012-04-24 16:41 ` [PATCH 5/7] mmc: tmio: add regulator support Guennadi Liakhovetski 2012-04-24 16:41 ` Guennadi Liakhovetski 2012-04-26 12:11 ` Mark Brown 2012-04-26 12:11 ` Mark Brown 2012-04-24 16:41 ` Guennadi Liakhovetski [this message] 2012-04-24 16:41 ` [PATCH 6/7] mmc: sdhi: do not install dummy callbacks Guennadi Liakhovetski 2012-04-24 16:41 ` [PATCH 7/7] sh: ecovec: switch MMC power control to regulators Guennadi Liakhovetski 2012-04-24 16:41 ` Guennadi Liakhovetski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1335285707-22707-7-git-send-email-g.liakhovetski@gmx.de \ --to=g.liakhovetski@gmx.de \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=magnus.damm@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.