| Message ID | 1445625991-5343-4-git-send-email-marex@denx.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | Andreas Bießmann |
| Headers | show |
On 23.10.15 20:46, Marek Vasut wrote: > Global variables are bad. Get rid of this particular one, so we can > correctly instantiate multiple atmel mci interfaces, without having > them interfere with one another. > > Signed-off-by: Marek Vasut <marex@denx.de> Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com> > --- > drivers/mmc/gen_atmel_mci.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c > index abc77cc..9a0332f 100644 > --- a/drivers/mmc/gen_atmel_mci.c > +++ b/drivers/mmc/gen_atmel_mci.c > @@ -35,10 +35,9 @@ > struct atmel_mci_priv { > struct mmc_config cfg; > struct atmel_mci *mci; > + unsigned int initialized:1; > }; > > -static int initialized = 0; > - > /* Read Atmel MCI IP version */ > static unsigned int atmel_mci_get_version(struct atmel_mci *mci) > { > @@ -121,7 +120,7 @@ static void mci_set_mode(struct mmc *mmc, u32 hz, u32 blklen) > > udelay(50); > > - initialized = 1; > + priv->initialized = 1; > } > > /* Return the CMDR with flags for a given command and data packet */ > @@ -210,7 +209,7 @@ mci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) > u32 error_flags = 0; > u32 status; > > - if (!initialized) { > + if (!priv->initialized) { > puts ("MCI not initialized!\n"); > return COMM_ERR; > } > @@ -415,6 +414,7 @@ int atmel_mci_init(void *regs) > cfg->ops = &atmel_mci_ops; > > priv->mci = (struct atmel_mci *)regs; > + priv->initialized = 0; > > /* need to be able to pass these in on a board by board basis */ > cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34; >
Dear Marek Vasut, Marek Vasut <marex@denx.de> writes: >Global variables are bad. Get rid of this particular one, so we can >correctly instantiate multiple atmel mci interfaces, without having >them interfere with one another. > >Signed-off-by: Marek Vasut <marex@denx.de> >Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com> >--- > drivers/mmc/gen_atmel_mci.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c index abc77cc..9a0332f 100644 --- a/drivers/mmc/gen_atmel_mci.c +++ b/drivers/mmc/gen_atmel_mci.c @@ -35,10 +35,9 @@ struct atmel_mci_priv { struct mmc_config cfg; struct atmel_mci *mci; + unsigned int initialized:1; }; -static int initialized = 0; - /* Read Atmel MCI IP version */ static unsigned int atmel_mci_get_version(struct atmel_mci *mci) { @@ -121,7 +120,7 @@ static void mci_set_mode(struct mmc *mmc, u32 hz, u32 blklen) udelay(50); - initialized = 1; + priv->initialized = 1; } /* Return the CMDR with flags for a given command and data packet */ @@ -210,7 +209,7 @@ mci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) u32 error_flags = 0; u32 status; - if (!initialized) { + if (!priv->initialized) { puts ("MCI not initialized!\n"); return COMM_ERR; } @@ -415,6 +414,7 @@ int atmel_mci_init(void *regs) cfg->ops = &atmel_mci_ops; priv->mci = (struct atmel_mci *)regs; + priv->initialized = 0; /* need to be able to pass these in on a board by board basis */ cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
Global variables are bad. Get rid of this particular one, so we can correctly instantiate multiple atmel mci interfaces, without having them interfere with one another. Signed-off-by: Marek Vasut <marex@denx.de> --- drivers/mmc/gen_atmel_mci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)