From b54770812808d9fe960b2a44a0daf6e99eb19562 Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Tue, 18 Feb 2014 11:38:29 -0700 Subject: [PATCH] msm: kgsl: don't use sscanf() Friends do not let friends use sscanf(). CRs-Fixed: 563605 Change-Id: Ic0dedbad56af5bbee4fc833701d8bc93b118efa9 Signed-off-by: Jordan Crouse --- drivers/gpu/msm/kgsl_mmu.c | 4 ++-- drivers/gpu/msm/kgsl_sharedmem.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/msm/kgsl_mmu.c b/drivers/gpu/msm/kgsl_mmu.c index 6b04aadb9a0..f0f3b16dd62 100644 --- a/drivers/gpu/msm/kgsl_mmu.c +++ b/drivers/gpu/msm/kgsl_mmu.c @@ -139,12 +139,12 @@ kgsl_get_pagetable(unsigned long name) static struct kgsl_pagetable * _get_pt_from_kobj(struct kobject *kobj) { - unsigned long ptname; + unsigned int ptname; if (!kobj) return NULL; - if (sscanf(kobj->name, "%ld", &ptname) != 1) + if (kstrtou32(kobj->name, 0, &ptname)) return NULL; return kgsl_get_pagetable(ptname); diff --git a/drivers/gpu/msm/kgsl_sharedmem.c b/drivers/gpu/msm/kgsl_sharedmem.c index d3adf84977a..c8ea471324e 100644 --- a/drivers/gpu/msm/kgsl_sharedmem.c +++ b/drivers/gpu/msm/kgsl_sharedmem.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2002,2007-2013, The Linux Foundation. All rights reserved. +/* Copyright (c) 2002,2007-2014, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -73,12 +73,12 @@ static struct kgsl_process_private * _get_priv_from_kobj(struct kobject *kobj) { struct kgsl_process_private *private; - unsigned long name; + unsigned int name; if (!kobj) return NULL; - if (sscanf(kobj->name, "%ld", &name) != 1) + if (kstrtou32(kobj->name, 0, &name)) return NULL; list_for_each_entry(private, &kgsl_driver.process_list, list) { @@ -255,13 +255,13 @@ static int kgsl_drv_full_cache_threshold_store(struct device *dev, const char *buf, size_t count) { int ret; - unsigned int thresh; - ret = sscanf(buf, "%d", &thresh); - if (ret != 1) - return count; + unsigned int thresh = 0; + + ret = kgsl_sysfs_store(buf, &thresh); + if (ret) + return ret; kgsl_driver.full_cache_threshold = thresh; - return count; }