diff options
Diffstat (limited to 'drivers/mtd/maps/plat-ram.c')
-rw-r--r-- | drivers/mtd/maps/plat-ram.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c index 104576b5be34..a02eed94a231 100644 --- a/drivers/mtd/maps/plat-ram.c +++ b/drivers/mtd/maps/plat-ram.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * | 6 | * |
7 | * Generic platfrom device based RAM map | 7 | * Generic platfrom device based RAM map |
8 | * | 8 | * |
9 | * $Id: plat-ram.c,v 1.3 2005/03/19 22:41:27 gleixner Exp $ | 9 | * $Id: plat-ram.c,v 1.7 2005/11/07 11:14:28 gleixner Exp $ |
10 | * | 10 | * |
11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
12 | * it under the terms of the GNU General Public License as published by | 12 | * it under the terms of the GNU General Public License as published by |
@@ -91,7 +91,7 @@ static int platram_remove(struct device *dev) | |||
91 | 91 | ||
92 | dev_dbg(dev, "removing device\n"); | 92 | dev_dbg(dev, "removing device\n"); |
93 | 93 | ||
94 | if (info == NULL) | 94 | if (info == NULL) |
95 | return 0; | 95 | return 0; |
96 | 96 | ||
97 | if (info->mtd) { | 97 | if (info->mtd) { |
@@ -118,7 +118,7 @@ static int platram_remove(struct device *dev) | |||
118 | 118 | ||
119 | if (info->map.virt != NULL) | 119 | if (info->map.virt != NULL) |
120 | iounmap(info->map.virt); | 120 | iounmap(info->map.virt); |
121 | 121 | ||
122 | kfree(info); | 122 | kfree(info); |
123 | 123 | ||
124 | return 0; | 124 | return 0; |
@@ -139,7 +139,7 @@ static int platram_probe(struct device *dev) | |||
139 | int err = 0; | 139 | int err = 0; |
140 | 140 | ||
141 | dev_dbg(dev, "probe entered\n"); | 141 | dev_dbg(dev, "probe entered\n"); |
142 | 142 | ||
143 | if (dev->platform_data == NULL) { | 143 | if (dev->platform_data == NULL) { |
144 | dev_err(dev, "no platform data supplied\n"); | 144 | dev_err(dev, "no platform data supplied\n"); |
145 | err = -ENOENT; | 145 | err = -ENOENT; |
@@ -177,7 +177,7 @@ static int platram_probe(struct device *dev) | |||
177 | 177 | ||
178 | info->map.phys = res->start; | 178 | info->map.phys = res->start; |
179 | info->map.size = (res->end - res->start) + 1; | 179 | info->map.size = (res->end - res->start) + 1; |
180 | info->map.name = pdata->mapname != NULL ? pdata->mapname : pd->name; | 180 | info->map.name = pdata->mapname != NULL ? pdata->mapname : (char *)pd->name; |
181 | info->map.bankwidth = pdata->bankwidth; | 181 | info->map.bankwidth = pdata->bankwidth; |
182 | 182 | ||
183 | /* register our usage of the memory area */ | 183 | /* register our usage of the memory area */ |
@@ -240,7 +240,7 @@ static int platram_probe(struct device *dev) | |||
240 | dev_err(dev, "add_mtd_device() failed\n"); | 240 | dev_err(dev, "add_mtd_device() failed\n"); |
241 | err = -ENOMEM; | 241 | err = -ENOMEM; |
242 | } | 242 | } |
243 | 243 | ||
244 | dev_info(dev, "registered mtd device\n"); | 244 | dev_info(dev, "registered mtd device\n"); |
245 | return err; | 245 | return err; |
246 | 246 | ||
@@ -254,6 +254,7 @@ static int platram_probe(struct device *dev) | |||
254 | 254 | ||
255 | static struct device_driver platram_driver = { | 255 | static struct device_driver platram_driver = { |
256 | .name = "mtd-ram", | 256 | .name = "mtd-ram", |
257 | .owner = THIS_MODULE, | ||
257 | .bus = &platform_bus_type, | 258 | .bus = &platform_bus_type, |
258 | .probe = platram_probe, | 259 | .probe = platram_probe, |
259 | .remove = platram_remove, | 260 | .remove = platram_remove, |