From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20080604115844.881301782@gmail.com> References: <20080604115633.116832712@gmail.com> Date: Wed, 04 Jun 2008 20:56:53 +0900 From: Akinobu Mita Subject: [patch -v3 20/22] s390: use memory_read_from_buffer Content-Disposition: inline; filename=s390-ipl-use-memory-read-from-buffer.patch Sender: linux-kernel-owner@vger.kernel.org List-Archive: List-Post: To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org Cc: Martin Schwidefsky , Heiko Carstens , linux390@de.ibm.com, linux-s390@vger.kernel.org List-ID: Signed-off-by: Akinobu Mita Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: linux390@de.ibm.com Cc: linux-s390@vger.kernel.org --- arch/s390/kernel/ipl.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) Index: 2.6-git/arch/s390/kernel/ipl.c =================================================================== --- 2.6-git.orig/arch/s390/kernel/ipl.c +++ 2.6-git/arch/s390/kernel/ipl.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -285,14 +286,8 @@ static struct kobj_attribute sys_ipl_dev static ssize_t ipl_parameter_read(struct kobject *kobj, struct bin_attribute *attr, char *buf, loff_t off, size_t count) { - unsigned int size = IPL_PARMBLOCK_SIZE; - - if (off > size) - return 0; - if (off + count > size) - count = size - off; - memcpy(buf, (void *)IPL_PARMBLOCK_START + off, count); - return count; + return memory_read_from_buffer(buf, count, &off, IPL_PARMBLOCK_START, + IPL_PARMBLOCK_SIZE); } static struct bin_attribute ipl_parameter_attr = { @@ -310,12 +305,7 @@ static ssize_t ipl_scp_data_read(struct unsigned int size = IPL_PARMBLOCK_START->ipl_info.fcp.scp_data_len; void *scp_data = &IPL_PARMBLOCK_START->ipl_info.fcp.scp_data; - if (off > size) - return 0; - if (off + count > size) - count = size - off; - memcpy(buf, scp_data + off, count); - return count; + return memory_read_from_buffer(buf, count, &off, scp_data, size); } static struct bin_attribute ipl_scp_data_attr = { --