s390/tape: Remove count parameter from read/write_block functions

The count parameter of the read/write_block discipline functions was
never used. Remove it.

Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
Reviewed-by: Jens Remus <jremus@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/drivers/s390/char/tape.h b/drivers/s390/char/tape.h
index 0aba30efb483d7fce64bf2c216c058077d065fe2..dc04518b7beca1776ef2991245719914b13e3a99 100644 (file)
--- a/drivers/s390/char/tape.h
+++ b/drivers/s390/char/tape.h
@@ -151,8 +151,8 @@ struct tape_discipline {
        int  (*setup_device)(struct tape_device *);
        void (*cleanup_device)(struct tape_device *);
        int (*irq)(struct tape_device *, struct tape_request *, struct irb *);
-       struct tape_request *(*read_block)(struct tape_device *, size_t);
-       struct tape_request *(*write_block)(struct tape_device *, size_t);
+       struct tape_request *(*read_block)(struct tape_device *);
+       struct tape_request *(*write_block)(struct tape_device *);
        void (*process_eov)(struct tape_device*);
        /* ioctl function for additional ioctls. */
        int (*ioctl_fn)(struct tape_device *, unsigned int, unsigned long);

diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 89778d922d9f021177237b11af1b28ec5c226b2f..3d557b55bda87d2ecb534d87d907f2ea96848661 100644 (file)
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -162,7 +162,7 @@ tapechar_read(struct file *filp, char __user *data, size_t count, loff_t *ppos)
 
        DBF_EVENT(6, "TCHAR:nbytes: %lx\n", block_size);
        /* Let the discipline build the ccw chain. */
-       request = device->discipline->read_block(device, block_size);
+       request = device->discipline->read_block(device);
        if (IS_ERR(request))
                return PTR_ERR(request);
        /* Execute it. */
@@ -215,7 +215,7 @@ tapechar_write(struct file *filp, const char __user *data, size_t count, loff_t
        DBF_EVENT(6,"TCHAR:nbytes: %lx\n", block_size);
        DBF_EVENT(6, "TCHAR:nblocks: %x\n", nblocks);
        /* Let the discipline build the ccw chain. */
-       request = device->discipline->write_block(device, block_size);
+       request = device->discipline->write_block(device);
        if (IS_ERR(request))
                return PTR_ERR(request);
        rc = 0;

diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index 176ae8e2eb6b152647e7ab0388979bc4feac8f1a..66d4a9b7e7102b6c3ca0a20c261261ac8ad15ebe 100644 (file)
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -641,7 +641,7 @@ tape_std_mtcompression(struct tape_device *device, int mt_count)
  * Read Block
  */
 struct tape_request *
-tape_std_read_block(struct tape_device *device, size_t count)
+tape_std_read_block(struct tape_device *device)
 {
        struct tape_request *request;
 
@@ -685,7 +685,7 @@ tape_std_read_backward(struct tape_device *device, struct tape_request *request)
  * Write Block
  */
 struct tape_request *
-tape_std_write_block(struct tape_device *device, size_t count)
+tape_std_write_block(struct tape_device *device)
 {
        struct tape_request *request;
 

diff --git a/drivers/s390/char/tape_std.h b/drivers/s390/char/tape_std.h
index dcc63ff587f92edadade759df147f2ab6c53ad20..eefeb5484214b5607741c3ec2b08f62be918247b 100644 (file)
--- a/drivers/s390/char/tape_std.h
+++ b/drivers/s390/char/tape_std.h
@@ -97,10 +97,10 @@
 #define SENSE_TAPE_POSITIONING         0x01
 
 /* discipline functions */
-struct tape_request *tape_std_read_block(struct tape_device *, size_t);
+struct tape_request *tape_std_read_block(struct tape_device *);
 void tape_std_read_backward(struct tape_device *device,
                            struct tape_request *request);
-struct tape_request *tape_std_write_block(struct tape_device *, size_t);
+struct tape_request *tape_std_write_block(struct tape_device *);
 
 /* Some non-mtop commands. */
 int tape_std_assign(struct tape_device *);