diff options
Diffstat (limited to 'fs/pstore/ram.c')
-rw-r--r-- | fs/pstore/ram.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index f883e7e74305..7003e5266f25 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c | |||
@@ -291,9 +291,8 @@ static void ramoops_free_przs(struct ramoops_context *cxt) | |||
291 | kfree(cxt->przs); | 291 | kfree(cxt->przs); |
292 | } | 292 | } |
293 | 293 | ||
294 | static int __devinit ramoops_init_przs(struct device *dev, | 294 | static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt, |
295 | struct ramoops_context *cxt, | 295 | phys_addr_t *paddr, size_t dump_mem_sz) |
296 | phys_addr_t *paddr, size_t dump_mem_sz) | ||
297 | { | 296 | { |
298 | int err = -ENOMEM; | 297 | int err = -ENOMEM; |
299 | int i; | 298 | int i; |
@@ -336,10 +335,9 @@ fail_prz: | |||
336 | return err; | 335 | return err; |
337 | } | 336 | } |
338 | 337 | ||
339 | static int __devinit ramoops_init_prz(struct device *dev, | 338 | static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt, |
340 | struct ramoops_context *cxt, | 339 | struct persistent_ram_zone **prz, |
341 | struct persistent_ram_zone **prz, | 340 | phys_addr_t *paddr, size_t sz, u32 sig) |
342 | phys_addr_t *paddr, size_t sz, u32 sig) | ||
343 | { | 341 | { |
344 | if (!sz) | 342 | if (!sz) |
345 | return 0; | 343 | return 0; |
@@ -367,7 +365,7 @@ static int __devinit ramoops_init_prz(struct device *dev, | |||
367 | return 0; | 365 | return 0; |
368 | } | 366 | } |
369 | 367 | ||
370 | static int __devinit ramoops_probe(struct platform_device *pdev) | 368 | static int ramoops_probe(struct platform_device *pdev) |
371 | { | 369 | { |
372 | struct device *dev = &pdev->dev; | 370 | struct device *dev = &pdev->dev; |
373 | struct ramoops_platform_data *pdata = pdev->dev.platform_data; | 371 | struct ramoops_platform_data *pdata = pdev->dev.platform_data; |