diff options
author | Alex Dubov <oakad@yahoo.com> | 2007-04-12 02:59:14 -0400 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-05-01 07:04:13 -0400 |
commit | e23f2b8a1a52c00f0150659eb0bfde3a73976ffe (patch) | |
tree | cd12f24c3b414e01929c323d23dd86e8bc5384f0 /drivers/mmc/tifm_sd.c | |
parent | 8dc4a61eca31dd45a9d45f9bc9c67d959f0f6cbd (diff) |
tifm: simplify bus match and uevent handlers
Remove code duplicating the kernel functionality and clean up data
structures involved in driver matching.
Signed-off-by: Alex Dubov <oakad@yahoo.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/tifm_sd.c')
-rw-r--r-- | drivers/mmc/tifm_sd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/tifm_sd.c b/drivers/mmc/tifm_sd.c index 8905b129e4e1..4388ee9062a0 100644 --- a/drivers/mmc/tifm_sd.c +++ b/drivers/mmc/tifm_sd.c | |||
@@ -948,7 +948,7 @@ static int tifm_sd_resume(struct tifm_dev *sock) | |||
948 | struct mmc_host *mmc = tifm_get_drvdata(sock); | 948 | struct mmc_host *mmc = tifm_get_drvdata(sock); |
949 | struct tifm_sd *host = mmc_priv(mmc); | 949 | struct tifm_sd *host = mmc_priv(mmc); |
950 | 950 | ||
951 | if (sock->media_id != FM_SD | 951 | if (sock->type != TIFM_TYPE_SD |
952 | || tifm_sd_initialize_host(host)) { | 952 | || tifm_sd_initialize_host(host)) { |
953 | tifm_eject(sock); | 953 | tifm_eject(sock); |
954 | return 0; | 954 | return 0; |
@@ -964,8 +964,8 @@ static int tifm_sd_resume(struct tifm_dev *sock) | |||
964 | 964 | ||
965 | #endif /* CONFIG_PM */ | 965 | #endif /* CONFIG_PM */ |
966 | 966 | ||
967 | static tifm_media_id tifm_sd_id_tbl[] = { | 967 | static struct tifm_device_id tifm_sd_id_tbl[] = { |
968 | FM_SD, 0 | 968 | { TIFM_TYPE_SD }, { } |
969 | }; | 969 | }; |
970 | 970 | ||
971 | static struct tifm_driver tifm_sd_driver = { | 971 | static struct tifm_driver tifm_sd_driver = { |