leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ramoops: use the platform data structure instead of module params

Browse Source 
As each board and system has different memory for ramoops.  It's better to
define the platform data instead of module params.

[akpm@linux-foundation.org: fix ramoops_remove() return type]
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marco Stornelli <marco.stornelli@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Kyungmin Park 2010-10-27 15:34:52 -07:00 committed by Linus Torvalds
parent 5de1cb2d0f
commit c3b92ce9e7
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/char/ramoops.c
View File

@ -25,6 +25,8 @@
#include <linux/time.h> #include <linux/time.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/platform_device.h>
#include <linux/ramoops.h>
#define RAMOOPS_KERNMSG_HDR "====" #define RAMOOPS_KERNMSG_HDR "===="
#define RAMOOPS_HEADER_SIZE (5 + sizeof(struct timeval)) #define RAMOOPS_HEADER_SIZE (5 + sizeof(struct timeval))
@ -91,11 +93,17 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper,
cxt->count = (cxt->count + 1) % cxt->max_count; cxt->count = (cxt->count + 1) % cxt->max_count;
} }
static int __init ramoops_init(void) static int __init ramoops_probe(struct platform_device *pdev)
{ {
struct ramoops_platform_data *pdata = pdev->dev.platform_data;
struct ramoops_context *cxt = &oops_cxt; struct ramoops_context *cxt = &oops_cxt;
int err = -EINVAL; int err = -EINVAL;
if (pdata) {
mem_size = pdata->mem_size;
mem_address = pdata->mem_address;
}
if (!mem_size) { if (!mem_size) {
printk(KERN_ERR "ramoops: invalid size specification"); printk(KERN_ERR "ramoops: invalid size specification");
goto fail3; goto fail3;
@ -142,7 +150,7 @@ fail3:
return err; return err;
} }
static void __exit ramoops_exit(void) static int __exit ramoops_remove(struct platform_device *pdev)
{ {
struct ramoops_context *cxt = &oops_cxt; struct ramoops_context *cxt = &oops_cxt;
@ -151,8 +159,26 @@ static void __exit ramoops_exit(void)
iounmap(cxt->virt_addr); iounmap(cxt->virt_addr);
release_mem_region(cxt->phys_addr, cxt->size); release_mem_region(cxt->phys_addr, cxt->size);
return 0;
} }
static struct platform_driver ramoops_driver = {
.remove = __exit_p(ramoops_remove),
.driver = {
.name = "ramoops",
.owner = THIS_MODULE,
},
};
static int __init ramoops_init(void)
{
return platform_driver_probe(&ramoops_driver, ramoops_probe);
}
static void __exit ramoops_exit(void)
{
platform_driver_unregister(&ramoops_driver);
}
module_init(ramoops_init); module_init(ramoops_init);
module_exit(ramoops_exit); module_exit(ramoops_exit);

15
include/linux/ramoops.h Normal file
View File

@ -0,0 +1,15 @@
#ifndef __RAMOOPS_H
#define __RAMOOPS_H
/*
* Ramoops platform data
* @mem_size memory size for ramoops
* @mem_address physical memory address to contain ramoops
*/
struct ramoops_platform_data {
unsigned long mem_size;
unsigned long mem_address;
};
#endif