On Tue, 26 May 2020 at 17:43, Pali Rohár <[email protected]> wrote: > > SDIO non-combo cards are not handled by mmc_block driver and do not have > accessible CID register which is used for MMC_NAME= construction. > > Signed-off-by: Pali Rohár <[email protected]> > Reviewed-by: Marek Behún <[email protected]> > --- > drivers/mmc/core/bus.c | 23 ++++++++++++++--------- > 1 file changed, 14 insertions(+), 9 deletions(-) > > diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c > index 74de3f2dd..103eea7cd 100644 > --- a/drivers/mmc/core/bus.c > +++ b/drivers/mmc/core/bus.c > @@ -93,15 +93,20 @@ mmc_bus_uevent(struct device *dev, struct kobj_uevent_env > *env) > return retval; > } > > - retval = add_uevent_var(env, "MMC_NAME=%s", mmc_card_name(card)); > - if (retval) > - return retval; > - > - /* > - * Request the mmc_block device. Note: that this is a direct request > - * for the module it carries no information as to what is inserted. > - */ > - retval = add_uevent_var(env, "MODALIAS=mmc:block"); > + if (card->type != MMC_TYPE_SDIO) { > + retval = add_uevent_var(env, "MMC_NAME=%s", > mmc_card_name(card)); > + if (retval) > + return retval; > + > + /* > + * Request the mmc_block device. > + * Note: that this is a direct request for the module it > carries > + * no information as to what is inserted. > + */ > + retval = add_uevent_var(env, "MODALIAS=mmc:block"); > + if (retval) > + return retval; > + } > > return retval; > } > -- > 2.20.1 >
Overall this change makes sense to me, but at nitpick... Rather than adding new nestled if-sentences, I suggest converting the function into using the "early returns" pattern instead. For example, already in the switch loop, above the code you change, we could just return 0 instead of setting type = NULL. Likewise, you can check "if (card->type == MMC_TYPE_SDIO) return 0;" Kind regards Uffe
