From patchwork Thu Jan 10 09:37:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Ramirez Luna X-Patchwork-Id: 1959201 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A5A68DF264 for ; Thu, 10 Jan 2013 09:37:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750913Ab3AJJh0 (ORCPT ); Thu, 10 Jan 2013 04:37:26 -0500 Received: from mail-oa0-f41.google.com ([209.85.219.41]:39711 "EHLO mail-oa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751407Ab3AJJhZ (ORCPT ); Thu, 10 Jan 2013 04:37:25 -0500 Received: by mail-oa0-f41.google.com with SMTP id k14so343730oag.14 for ; Thu, 10 Jan 2013 01:37:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=W0a/txdEqKAwXc1OQ6n/Ic+Sqo5gI7r/Rc0SkDVH+RM=; b=OyVuvvV7dVgDKDs1LYU3JRbAK4vnWPIMFylLhLei+/bHGRomA8vqB0uypv8/uKWwi1 EkRh2z5bVVxapb5F/TKAWRCx0BX2o9zx2z/SqcKDDvfaq0Zr77e4kXekStepi03hPghz pVd2SiWAp1Wsaaz3kLEduqTjDbdu0flR1DpWPXeHzVvcfeG2l57QHRP+hSzldh0X1W86 Jf7KjgHCq4M5T1sxiio6tB1FcEOF55Zw2wcaZSBzhvFzq3FhMPS6lpIOAZdG338k6rz4 NGQJP2s+edqjtAPcO/CHvDyd/XwRBEwBK6JNxqGk92HvSG+KGYra8Sup3Uk6aIc47o/z Zz+g== X-Received: by 10.60.26.234 with SMTP id o10mr41958467oeg.116.1357810644655; Thu, 10 Jan 2013 01:37:24 -0800 (PST) Received: from localhost.localdomain (cpe-76-185-160-228.tx.res.rr.com. [76.185.160.228]) by mx.google.com with ESMTPS id ag15sm826005oec.11.2013.01.10.01.37.23 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 10 Jan 2013 01:37:24 -0800 (PST) From: Omar Ramirez Luna To: Greg Kroah-Hartman Cc: Chen Gang , devel@driverdev.osuosl.org, linux-omap@vger.kernel.org, Omar Ramirez Luna Subject: [PATCH 5/5] staging: tidspbridge: remove unused code to handle iva_img Date: Thu, 10 Jan 2013 03:37:02 -0600 Message-Id: <1357810622-1709-6-git-send-email-omar.ramirez@copitl.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1357810622-1709-1-git-send-email-omar.ramirez@copitl.com> References: <1357810622-1709-1-git-send-email-omar.ramirez@copitl.com> X-Gm-Message-State: ALoCoQnFUGeKJaC+fejSt4Zt0PhaIYckAUUY2By6QxaSolNg3MibJxkajUELMnUAO5nVXPIs85OY Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org There is no way to specify the value of iva_img and since this code is not being used, remove it. This analysis resulted from a report by Chen Gang , mentioning that the existing code was wrongly specifying the size to be copied. Signed-off-by: Omar Ramirez Luna --- .../staging/tidspbridge/include/dspbridge/proc.h | 2 -- drivers/staging/tidspbridge/rmgr/drv_interface.c | 1 - drivers/staging/tidspbridge/rmgr/proc.c | 4 ---- 3 files changed, 0 insertions(+), 7 deletions(-) diff --git a/drivers/staging/tidspbridge/include/dspbridge/proc.h b/drivers/staging/tidspbridge/include/dspbridge/proc.h index 851b356..774a3f6 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/proc.h +++ b/drivers/staging/tidspbridge/include/dspbridge/proc.h @@ -23,8 +23,6 @@ #include #include -extern char *iva_img; - /* * ======== proc_attach ======== * Purpose: diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c index e6f31d8..df0f37e 100644 --- a/drivers/staging/tidspbridge/rmgr/drv_interface.c +++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c @@ -65,7 +65,6 @@ static struct class *bridge_class; static u32 driver_context; static s32 driver_major; static char *base_img; -char *iva_img; static s32 shm_size = 0x500000; /* 5 MB */ static int tc_wordswapon; /* Default value is always false */ #ifdef CONFIG_TIDSPBRIDGE_RECOVERY diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c index ac016ed..e1bdf6e 100644 --- a/drivers/staging/tidspbridge/rmgr/proc.c +++ b/drivers/staging/tidspbridge/rmgr/proc.c @@ -382,7 +382,6 @@ static int get_exec_file(struct cfg_devnode *dev_node_obj, u32 size, char *exec_file) { u8 dev_type; - s32 len; struct drv_data *drv_datap = dev_get_drvdata(bridge); dev_get_dev_type(hdev_obj, (u8 *) &dev_type); @@ -398,9 +397,6 @@ static int get_exec_file(struct cfg_devnode *dev_node_obj, return -EINVAL; strcpy(exec_file, drv_datap->base_img); - } else if (dev_type == IVA_UNIT && iva_img) { - len = strlen(iva_img); - strncpy(exec_file, iva_img, len + 1); } else { return -ENOENT; }