zio: new master, with vmalloc size change

This picks a master commit of zio, which now includes all the things needed for this driver. Since the data_done method now returns integer (instead of void), the code is fixed in that respect, partly undoing commit: 18f2d110 kernel: remove all warnings Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

zio: new master, with vmalloc size change
This picks a master commit of zio, which now includes all the things needed for this driver. Since the data_done method now returns integer (instead of void), the code is fixed in that respect, partly undoing commit: 18f2d110 kernel: remove all warnings Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
06a5c337 · Alessandro Rubini · ea7f95b5 · 06a5c337 · 7af87a01
Commit 06a5c337 authored Jul 02, 2013 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

fa-zio-trg.c kernel/fa-zio-trg.c +3 -3

zio zio +1 -1

No files found.
--- a/kernel/fa-zio-trg.c
+++ b/kernel/fa-zio-trg.c
@@ -219,7 +219,7 @@ static void zfat_change_status(struct zio_ti *ti, unsigned int status)
 * occurs before the natural end of the acquisition, un-filled block
 * are not stored.
 */
-static void zfat_data_done(struct zio_cset *cset)
+static int zfat_data_done(struct zio_cset *cset)
 {
 	struct zfad_block *zfad_block = cset->interleave->priv_d;
 	struct zio_bi *bi = cset->interleave->bi;
@@ -230,7 +230,7 @@ static void zfat_data_done(struct zio_cset *cset)

 	/* Nothing to store */
 	if (!zfad_block)
-		return;
+		return 0;

 	/* Store blocks */
 	for(i = 0; i < fa->n_shots; ++i)
@@ -250,7 +250,7 @@ static void zfat_data_done(struct zio_cset *cset)
 	kfree(zfad_block);
 	cset->interleave->priv_d = NULL;

-	return;
+	return 0;
 }

 /*

--- a/zio @ 7af87a01
+++ b/zio @ 7af87a01
-Subproject commit ec92a91935fb8da28eca33ae403f4f6d144892dc
+Subproject commit 7af87a011193d13fe8175a358ed1de2c8e28fa56