From patchwork Fri Mar 10 11:33:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 39948 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cmIo6-0004DC-Ns; Fri, 10 Mar 2017 11:34:02 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-8) with esmtp id 1cmIo4-0000RS-kh; Fri, 10 Mar 2017 12:34:02 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933754AbdCJLdw (ORCPT + 1 other); Fri, 10 Mar 2017 06:33:52 -0500 Received: from mga06.intel.com ([134.134.136.31]:9803 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933595AbdCJLdu (ORCPT ); Fri, 10 Mar 2017 06:33:50 -0500 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP; 10 Mar 2017 03:33:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,140,1486454400"; d="scan'208";a="74563267" Received: from acox1-desk1.ger.corp.intel.com ([10.252.18.115]) by fmsmga005.fm.intel.com with ESMTP; 10 Mar 2017 03:33:34 -0800 Subject: [PATCH 1/8] atomisp: remove dead code for SSSE3 From: Alan Cox To: greg@kroah.com, linux-media@vger.kernel.org Date: Fri, 10 Mar 2017 11:33:33 +0000 Message-ID: <148914560647.25309.2276061224604665212.stgit@acox1-desk1.ger.corp.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.3.10.112417 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, NO_URI_HTTPS 0, __ANY_URI 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_VERSION 0, __NO_HTML_TAG_RAW 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0' This is another define which is never used and references a header that doesn't exist, so consider it dead. Our memcpy is pretty smart anyway. Signed-off-by: Alan Cox --- .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 32 +------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c index 358d340..b041e56 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c @@ -39,10 +39,6 @@ #include "mmu/isp_mmu.h" #include "mmu/sh_mmu_mrfld.h" -#ifdef USE_SSSE3 -#include -#endif - struct hmm_bo_device bo_device; struct hmm_pool dynamic_pool; struct hmm_pool reserved_pool; @@ -53,9 +49,7 @@ const char *hmm_bo_type_strings[HMM_BO_LAST] = { "p", /* private */ "s", /* shared */ "u", /* user */ -#ifdef CONFIG_ION "i", /* ion */ -#endif }; static ssize_t bo_show(struct device *dev, struct device_attribute *attr, @@ -356,12 +350,7 @@ static int load_and_flush_by_kmap(ia_css_ptr virt, void *data, unsigned int byte virt += len; /* update virt for next loop */ if (des) { - -#ifdef USE_SSSE3 - _ssse3_memcpy(des, src, len); -#else memcpy(des, src, len); -#endif des += len; } @@ -388,11 +377,7 @@ static int load_and_flush(ia_css_ptr virt, void *data, unsigned int bytes) void *src = bo->vmap_addr; src += (virt - bo->start); -#ifdef USE_SSSE3 - _ssse3_memcpy(data, src, bytes); -#else memcpy(data, src, bytes); -#endif if (bo->status & HMM_BO_VMAPED_CACHED) clflush_cache_range(src, bytes); } else { @@ -404,11 +389,7 @@ static int load_and_flush(ia_css_ptr virt, void *data, unsigned int bytes) else vptr = vptr + (virt - bo->start); -#ifdef USE_SSSE3 - _ssse3_memcpy(data, vptr, bytes); -#else memcpy(data, vptr, bytes); -#endif clflush_cache_range(vptr, bytes); hmm_bo_vunmap(bo); } @@ -450,11 +431,7 @@ int hmm_store(ia_css_ptr virt, const void *data, unsigned int bytes) void *dst = bo->vmap_addr; dst += (virt - bo->start); -#ifdef USE_SSSE3 - _ssse3_memcpy(dst, data, bytes); -#else memcpy(dst, data, bytes); -#endif if (bo->status & HMM_BO_VMAPED_CACHED) clflush_cache_range(dst, bytes); } else { @@ -464,11 +441,7 @@ int hmm_store(ia_css_ptr virt, const void *data, unsigned int bytes) if (vptr) { vptr = vptr + (virt - bo->start); -#ifdef USE_SSSE3 - _ssse3_memcpy(vptr, data, bytes); -#else memcpy(vptr, data, bytes); -#endif clflush_cache_range(vptr, bytes); hmm_bo_vunmap(bo); return 0; @@ -504,11 +477,8 @@ int hmm_store(ia_css_ptr virt, const void *data, unsigned int bytes) virt += len; -#ifdef USE_SSSE3 - _ssse3_memcpy(des, src, len); -#else memcpy(des, src, len); -#endif + src += len; clflush_cache_range(des, len);