diff options
-rw-r--r-- | drivers/acpi/apei/erst.c | 8 | ||||
-rw-r--r-- | fs/pstore/platform.c | 3 | ||||
-rw-r--r-- | include/linux/pstore.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c index d842ac4f8cfe..6053f4780df9 100644 --- a/drivers/acpi/apei/erst.c +++ b/drivers/acpi/apei/erst.c | |||
@@ -933,8 +933,8 @@ static int erst_open_pstore(struct pstore_info *psi); | |||
933 | static int erst_close_pstore(struct pstore_info *psi); | 933 | static int erst_close_pstore(struct pstore_info *psi); |
934 | static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, | 934 | static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, |
935 | struct timespec *time, struct pstore_info *psi); | 935 | struct timespec *time, struct pstore_info *psi); |
936 | static u64 erst_writer(enum pstore_type_id type, int part, size_t size, | 936 | static u64 erst_writer(enum pstore_type_id type, unsigned int part, |
937 | struct pstore_info *psi); | 937 | size_t size, struct pstore_info *psi); |
938 | static int erst_clearer(enum pstore_type_id type, u64 id, | 938 | static int erst_clearer(enum pstore_type_id type, u64 id, |
939 | struct pstore_info *psi); | 939 | struct pstore_info *psi); |
940 | 940 | ||
@@ -1040,8 +1040,8 @@ out: | |||
1040 | return (rc < 0) ? rc : (len - sizeof(*rcd)); | 1040 | return (rc < 0) ? rc : (len - sizeof(*rcd)); |
1041 | } | 1041 | } |
1042 | 1042 | ||
1043 | static u64 erst_writer(enum pstore_type_id type, int part, size_t size, | 1043 | static u64 erst_writer(enum pstore_type_id type, unsigned int part, |
1044 | struct pstore_info *psi) | 1044 | size_t size, struct pstore_info *psi) |
1045 | { | 1045 | { |
1046 | struct cper_pstore_record *rcd = (struct cper_pstore_record *) | 1046 | struct cper_pstore_record *rcd = (struct cper_pstore_record *) |
1047 | (erst_info.buf - sizeof(*rcd)); | 1047 | (erst_info.buf - sizeof(*rcd)); |
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 163bb40511e7..49ff1de2178a 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c | |||
@@ -67,7 +67,8 @@ static void pstore_dump(struct kmsg_dumper *dumper, | |||
67 | unsigned long size, total = 0; | 67 | unsigned long size, total = 0; |
68 | char *dst, *why; | 68 | char *dst, *why; |
69 | u64 id; | 69 | u64 id; |
70 | int hsize, part = 1; | 70 | int hsize; |
71 | unsigned int part = 1; | ||
71 | 72 | ||
72 | if (reason < ARRAY_SIZE(reason_str)) | 73 | if (reason < ARRAY_SIZE(reason_str)) |
73 | why = reason_str[reason]; | 74 | why = reason_str[reason]; |
diff --git a/include/linux/pstore.h b/include/linux/pstore.h index 12be8f193d09..cc03bbf5c4b8 100644 --- a/include/linux/pstore.h +++ b/include/linux/pstore.h | |||
@@ -39,7 +39,7 @@ struct pstore_info { | |||
39 | int (*close)(struct pstore_info *psi); | 39 | int (*close)(struct pstore_info *psi); |
40 | ssize_t (*read)(u64 *id, enum pstore_type_id *type, | 40 | ssize_t (*read)(u64 *id, enum pstore_type_id *type, |
41 | struct timespec *time, struct pstore_info *psi); | 41 | struct timespec *time, struct pstore_info *psi); |
42 | u64 (*write)(enum pstore_type_id type, int part, | 42 | u64 (*write)(enum pstore_type_id type, unsigned int part, |
43 | size_t size, struct pstore_info *psi); | 43 | size_t size, struct pstore_info *psi); |
44 | int (*erase)(enum pstore_type_id type, u64 id, | 44 | int (*erase)(enum pstore_type_id type, u64 id, |
45 | struct pstore_info *psi); | 45 | struct pstore_info *psi); |