From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: pxa: propagate errors from regulator_enable() to pxamci
Date: Fri, 31 May 2013 22:48:34 +0200 [thread overview]
Message-ID: <2230532.ij37rWB9OD@wuerfel> (raw)
In-Reply-To: <2578085.T8WORaQtxA@wuerfel>
[using Mark's proper address. I did the patch a while ago before it was changed]
On Friday 31 May 2013 22:41:16 Arnd Bergmann wrote:
> The em_x270_mci_setpower() and em_x270_usb_hub_init() functions
> call regulator_enable(), which may return an error that must
> be checked.
>
> This changes the em_x270_usb_hub_init() function to bail out
> if it fails, and changes the pxamci_platform_data->setpower
> callback so that the a failed em_x270_mci_setpower call
> can be propagated by the pxamci driver into the mmc core.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Mike Rapoport <mike@compulab.co.il>
> Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
> Cc: Mark Brown <broonie@kernel.org>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Chris Ball <cjb@laptop.org>
>
> diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
> index 446563a..1df06c2 100644
> --- a/arch/arm/mach-pxa/em-x270.c
> +++ b/arch/arm/mach-pxa/em-x270.c
> @@ -477,16 +477,24 @@ static int em_x270_usb_hub_init(void)
> /* USB Hub power-on and reset */
> gpio_direction_output(usb_hub_reset, 1);
> gpio_direction_output(GPIO9_USB_VBUS_EN, 0);
> - regulator_enable(em_x270_usb_ldo);
> + err = regulator_enable(em_x270_usb_ldo);
> + if (err)
> + goto err_free_rst_gpio;
> +
> gpio_set_value(usb_hub_reset, 0);
> gpio_set_value(usb_hub_reset, 1);
> regulator_disable(em_x270_usb_ldo);
> - regulator_enable(em_x270_usb_ldo);
> + if (err)
> + goto err_free_rst_gpio;
> +
> + err = regulator_enable(em_x270_usb_ldo);
> gpio_set_value(usb_hub_reset, 0);
> gpio_set_value(GPIO9_USB_VBUS_EN, 1);
>
> return 0;
>
> +err_free_rst_gpio:
> + gpio_free(usb_hub_reset);
> err_free_vbus_gpio:
> gpio_free(GPIO9_USB_VBUS_EN);
> err_free_usb_ldo:
> @@ -592,7 +600,7 @@ err_irq:
> return err;
> }
>
> -static void em_x270_mci_setpower(struct device *dev, unsigned int vdd)
> +static int em_x270_mci_setpower(struct device *dev, unsigned int vdd)
> {
> struct pxamci_platform_data* p_d = dev->platform_data;
>
> @@ -600,10 +608,11 @@ static void em_x270_mci_setpower(struct device *dev, unsigned int vdd)
> int vdd_uV = (2000 + (vdd - __ffs(MMC_VDD_20_21)) * 100) * 1000;
>
> regulator_set_voltage(em_x270_sdio_ldo, vdd_uV, vdd_uV);
> - regulator_enable(em_x270_sdio_ldo);
> + return regulator_enable(em_x270_sdio_ldo);
> } else {
> regulator_disable(em_x270_sdio_ldo);
> }
> + return 0;
> }
>
> static void em_x270_mci_exit(struct device *dev, void *data)
> diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
> index 7a12c1b..4c72fa6 100644
> --- a/arch/arm/mach-pxa/mainstone.c
> +++ b/arch/arm/mach-pxa/mainstone.c
> @@ -408,7 +408,7 @@ static int mainstone_mci_init(struct device *dev, irq_handler_t mstone_detect_in
> return err;
> }
>
> -static void mainstone_mci_setpower(struct device *dev, unsigned int vdd)
> +static int mainstone_mci_setpower(struct device *dev, unsigned int vdd)
> {
> struct pxamci_platform_data* p_d = dev->platform_data;
>
> @@ -420,6 +420,7 @@ static void mainstone_mci_setpower(struct device *dev, unsigned int vdd)
> printk(KERN_DEBUG "%s: off\n", __func__);
> MST_MSCWR1 &= ~MST_MSCWR1_MMC_ON;
> }
> + return 0;
> }
>
> static void mainstone_mci_exit(struct device *dev, void *data)
> diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
> index fb7f1d1..13e5b00 100644
> --- a/arch/arm/mach-pxa/pcm990-baseboard.c
> +++ b/arch/arm/mach-pxa/pcm990-baseboard.c
> @@ -335,7 +335,7 @@ static int pcm990_mci_init(struct device *dev, irq_handler_t mci_detect_int,
> return err;
> }
>
> -static void pcm990_mci_setpower(struct device *dev, unsigned int vdd)
> +static int pcm990_mci_setpower(struct device *dev, unsigned int vdd)
> {
> struct pxamci_platform_data *p_d = dev->platform_data;
> u8 val;
> @@ -348,6 +348,7 @@ static void pcm990_mci_setpower(struct device *dev, unsigned int vdd)
> val &= ~PCM990_CTRL_MMC2PWR;
>
> pcm990_cpld_writeb(PCM990_CTRL_MMC2PWR, PCM990_CTRL_REG5);
> + return 0;
> }
>
> static void pcm990_mci_exit(struct device *dev, void *data)
> diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
> index 50ccd5f..cb374c2 100644
> --- a/arch/arm/mach-pxa/poodle.c
> +++ b/arch/arm/mach-pxa/poodle.c
> @@ -258,7 +258,7 @@ err_free_2:
> return err;
> }
>
> -static void poodle_mci_setpower(struct device *dev, unsigned int vdd)
> +static int poodle_mci_setpower(struct device *dev, unsigned int vdd)
> {
> struct pxamci_platform_data* p_d = dev->platform_data;
>
> @@ -270,6 +270,8 @@ static void poodle_mci_setpower(struct device *dev, unsigned int vdd)
> gpio_set_value(POODLE_GPIO_SD_PWR1, 0);
> gpio_set_value(POODLE_GPIO_SD_PWR, 0);
> }
> +
> + return 0;
> }
>
> static void poodle_mci_exit(struct device *dev, void *data)
> diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
> index 362726c..49bfcd7 100644
> --- a/arch/arm/mach-pxa/spitz.c
> +++ b/arch/arm/mach-pxa/spitz.c
> @@ -597,7 +597,7 @@ static inline void spitz_spi_init(void) {}
> * NOTE: The card detect interrupt isn't debounced so we delay it by 250ms to
> * give the card a chance to fully insert/eject.
> */
> -static void spitz_mci_setpower(struct device *dev, unsigned int vdd)
> +static int spitz_mci_setpower(struct device *dev, unsigned int vdd)
> {
> struct pxamci_platform_data* p_d = dev->platform_data;
>
> @@ -605,6 +605,8 @@ static void spitz_mci_setpower(struct device *dev, unsigned int vdd)
> spitz_card_pwr_ctrl(SCOOP_CPR_SD_3V, SCOOP_CPR_SD_3V);
> else
> spitz_card_pwr_ctrl(SCOOP_CPR_SD_3V, 0x0);
> +
> + return 0;
> }
>
> static struct pxamci_platform_data spitz_mci_platform_data = {
> diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c
> index 88fde43..62aea3e 100644
> --- a/arch/arm/mach-pxa/stargate2.c
> +++ b/arch/arm/mach-pxa/stargate2.c
> @@ -734,9 +734,10 @@ static int stargate2_mci_init(struct device *dev,
> *
> * Very simple control. Either it is on or off and is controlled by
> * a gpio pin */
> -static void stargate2_mci_setpower(struct device *dev, unsigned int vdd)
> +static int stargate2_mci_setpower(struct device *dev, unsigned int vdd)
> {
> gpio_set_value(SG2_SD_POWER_ENABLE, !!vdd);
> + return 0;
> }
>
> static void stargate2_mci_exit(struct device *dev, void *data)
> diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
> index 847b199..2c5a91b 100644
> --- a/drivers/mmc/host/pxamci.c
> +++ b/drivers/mmc/host/pxamci.c
> @@ -128,7 +128,7 @@ static inline int pxamci_set_power(struct pxamci_host *host,
> !!on ^ host->pdata->gpio_power_invert);
> }
> if (!host->vcc && host->pdata && host->pdata->setpower)
> - host->pdata->setpower(mmc_dev(host->mmc), vdd);
> + return host->pdata->setpower(mmc_dev(host->mmc), vdd);
>
> return 0;
> }
> diff --git a/include/linux/platform_data/mmc-pxamci.h b/include/linux/platform_data/mmc-pxamci.h
> index 9eb515b..1706b35 100644
> --- a/include/linux/platform_data/mmc-pxamci.h
> +++ b/include/linux/platform_data/mmc-pxamci.h
> @@ -12,7 +12,7 @@ struct pxamci_platform_data {
> unsigned long detect_delay_ms; /* delay in millisecond before detecting cards after interrupt */
> int (*init)(struct device *, irq_handler_t , void *);
> int (*get_ro)(struct device *);
> - void (*setpower)(struct device *, unsigned int);
> + int (*setpower)(struct device *, unsigned int);
> void (*exit)(struct device *, void *);
> int gpio_card_detect; /* gpio detecting card insertion */
> int gpio_card_ro; /* gpio detecting read only toggle */
next prev parent reply other threads:[~2013-05-31 20:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-31 20:41 [PATCH] ARM: pxa: propagate errors from regulator_enable() to pxamci Arnd Bergmann
2013-05-31 20:48 ` Arnd Bergmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-07-05 15:51 Arnd Bergmann
2013-07-05 15:53 ` Chris Ball
2013-07-23 19:15 ` Olof Johansson
2013-07-08 4:35 ` Sachin Kamat
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=2230532.ij37rWB9OD@wuerfel \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox