[OPW,kernel,2/5] acpi: apei: Use new pstore_info API
diff mbox

Message ID 1414668348-14847-3-git-send-email-somyaanand214@gmail.com
State New, archived
Headers show

Commit Message

Somya Anand Oct. 30, 2014, 11:25 a.m. UTC
'struct pstore_info' now uses 'struct timespec64', so we have to
update .read and .erase functions to use 'struct timespec64'.

Signed-off-by: Somya Anand <somyaanand214@gmail.com>
---
 drivers/acpi/apei/erst.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Comments

Arnd Bergmann Oct. 30, 2014, 11:46 a.m. UTC | #1
On Thursday 30 October 2014 16:55:45 Somya Anand wrote:
>  static int erst_clearer(enum pstore_type_id type, u64 id, int count,
> -                       struct timespec time, struct pstore_info *psi)
> +                       struct timespec64ss time, struct pstore_info *psi)
>  {
>         return erst_clear(id);
>  }

timespec64ss ?

	Arnd

Patch
diff mbox

diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index a84871a..57e7bc8 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -931,13 +931,13 @@  static int erst_check_table(struct acpi_table_erst *erst_tab)
 static int erst_open_pstore(struct pstore_info *psi);
 static int erst_close_pstore(struct pstore_info *psi);
 static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count,
-			   struct timespec *time, char **buf,
+			   struct timespec64 *time, char **buf,
 			   bool *compressed, struct pstore_info *psi);
 static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,
 		       u64 *id, unsigned int part, int count, bool compressed,
 		       size_t size, struct pstore_info *psi);
 static int erst_clearer(enum pstore_type_id type, u64 id, int count,
-			struct timespec time, struct pstore_info *psi);
+			struct timespec64 time, struct pstore_info *psi);
 
 static struct pstore_info erst_info = {
 	.owner		= THIS_MODULE,
@@ -991,7 +991,7 @@  static int erst_close_pstore(struct pstore_info *psi)
 }
 
 static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count,
-			   struct timespec *time, char **buf,
+			   struct timespec64 *ts64, char **buf,
 			   bool *compressed, struct pstore_info *psi)
 {
 	int rc;
@@ -999,7 +999,6 @@  static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count,
 	u64 record_id;
 	struct cper_pstore_record *rcd;
 	size_t rcd_len = sizeof(*rcd) + erst_info.bufsize;
-	struct timespec64 *ts64 = time;
 
 	if (erst_disable)
 		return -ENODEV;
@@ -1114,7 +1113,7 @@  static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,
 }
 
 static int erst_clearer(enum pstore_type_id type, u64 id, int count,
-			struct timespec time, struct pstore_info *psi)
+			struct timespec64ss time, struct pstore_info *psi)
 {
 	return erst_clear(id);
 }