Commit f568f6ca authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

pstore: remove __dev* attributes.

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit from the pstore filesystem.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Anton Vorontsov <cbouatmailru@gmail.com>
Cc: Colin Cross <ccross@android.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fcb35a9b
...@@ -291,9 +291,8 @@ static void ramoops_free_przs(struct ramoops_context *cxt) ...@@ -291,9 +291,8 @@ static void ramoops_free_przs(struct ramoops_context *cxt)
kfree(cxt->przs); kfree(cxt->przs);
} }
static int __devinit ramoops_init_przs(struct device *dev, static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt,
struct ramoops_context *cxt, phys_addr_t *paddr, size_t dump_mem_sz)
phys_addr_t *paddr, size_t dump_mem_sz)
{ {
int err = -ENOMEM; int err = -ENOMEM;
int i; int i;
...@@ -336,10 +335,9 @@ static int __devinit ramoops_init_przs(struct device *dev, ...@@ -336,10 +335,9 @@ static int __devinit ramoops_init_przs(struct device *dev,
return err; return err;
} }
static int __devinit ramoops_init_prz(struct device *dev, static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,
struct ramoops_context *cxt, struct persistent_ram_zone **prz,
struct persistent_ram_zone **prz, phys_addr_t *paddr, size_t sz, u32 sig)
phys_addr_t *paddr, size_t sz, u32 sig)
{ {
if (!sz) if (!sz)
return 0; return 0;
...@@ -367,7 +365,7 @@ static int __devinit ramoops_init_prz(struct device *dev, ...@@ -367,7 +365,7 @@ static int __devinit ramoops_init_prz(struct device *dev,
return 0; return 0;
} }
static int __devinit ramoops_probe(struct platform_device *pdev) static int ramoops_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct ramoops_platform_data *pdata = pdev->dev.platform_data; struct ramoops_platform_data *pdata = pdev->dev.platform_data;
......
...@@ -390,8 +390,8 @@ static int persistent_ram_buffer_map(phys_addr_t start, phys_addr_t size, ...@@ -390,8 +390,8 @@ static int persistent_ram_buffer_map(phys_addr_t start, phys_addr_t size,
return 0; return 0;
} }
static int __devinit persistent_ram_post_init(struct persistent_ram_zone *prz, static int persistent_ram_post_init(struct persistent_ram_zone *prz, u32 sig,
u32 sig, int ecc_size) int ecc_size)
{ {
int ret; int ret;
...@@ -443,9 +443,8 @@ void persistent_ram_free(struct persistent_ram_zone *prz) ...@@ -443,9 +443,8 @@ void persistent_ram_free(struct persistent_ram_zone *prz)
kfree(prz); kfree(prz);
} }
struct persistent_ram_zone * __devinit persistent_ram_new(phys_addr_t start, struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,
size_t size, u32 sig, u32 sig, int ecc_size)
int ecc_size)
{ {
struct persistent_ram_zone *prz; struct persistent_ram_zone *prz;
int ret = -ENOMEM; int ret = -ENOMEM;
......
...@@ -46,9 +46,8 @@ struct persistent_ram_zone { ...@@ -46,9 +46,8 @@ struct persistent_ram_zone {
size_t old_log_size; size_t old_log_size;
}; };
struct persistent_ram_zone * __devinit persistent_ram_new(phys_addr_t start, struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,
size_t size, u32 sig, u32 sig, int ecc_size);
int ecc_size);
void persistent_ram_free(struct persistent_ram_zone *prz); void persistent_ram_free(struct persistent_ram_zone *prz);
void persistent_ram_zap(struct persistent_ram_zone *prz); void persistent_ram_zap(struct persistent_ram_zone *prz);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment