Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9cef21a authored by Akinobu Mita's avatar Akinobu Mita Committed by Heiko Carstens
Browse files

[S390] s390/cio: use memory_read_from_buffer() 



Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 7785857a

drivers/s390/cio/chp.c

+2 −9
Original line number Diff line number Diff line
@@ -143,21 +143,14 @@ static ssize_t chp_measurement_chars_read(struct kobject *kobj, 
{

	struct channel_path *chp;

	struct device *device;

	unsigned int size;



	device = container_of(kobj, struct device, kobj);

	chp = to_channelpath(device);

	if (!chp->cmg_chars)

		return 0;



	size = sizeof(struct cmg_chars);



	if (off > size)

		return 0;

	if (off + count > size)

		count = size - off;

	memcpy(buf, chp->cmg_chars + off, count);

	return count;

	return memory_read_from_buffer(buf, count, &off,

				chp->cmg_chars, sizeof(struct cmg_chars));

}



static struct bin_attribute chp_measurement_chars_attr = {