[PATCH 1/1] UBUNTU: SAUCE: mmc: add MODALIAS linkage for MMC/SD devices

[Stefan Bader]

Andy Whitcroft wrote:
> Currently we are using an explicit udev rule to trigger loading of the
> mmc-block module when an MMC or SD card is detected:
> 
>     SUBSYSTEM=="mmc", RUN+="/sbin/modprobe -Qba mmc-block"
> 
> It makes much more sense for the mmc bus driver and the mmc-block module to
> share MODALIAS information so that they are linked automatically.
> 
> There is no real information of use in the MMC system at the current time.
> All devices inserted require us to load the mmc-block device.  Until such
> time as useful parameters exist simply reflect the module linkage via
> the module alias below:
> 
> 	mmc:block
> 
> Signed-off-by: Andy Whitcroft <apw at canonical.com>
> ---
>  drivers/mmc/card/block.c |    2 ++
>  drivers/mmc/core/bus.c   |    8 ++++++++
>  2 files changed, 10 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
> index 3d067c3..feddf16 100644
> --- a/drivers/mmc/card/block.c
> +++ b/drivers/mmc/card/block.c
> @@ -41,6 +41,8 @@
>  
>  #include "queue.h"
>  
> +MODULE_ALIAS("mmc:block");
> +
>  /*
>   * max 8 partitions per card
>   */
> diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
> index f210a8e..bdb165f 100644
> --- a/drivers/mmc/core/bus.c
> +++ b/drivers/mmc/core/bus.c
> @@ -84,6 +84,14 @@ mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
>  	}
>  
>  	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");
>  
>  	return retval;
>  }
Looks sane to me. Ack

-- 

When all other means of communication fail, try words!