Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp4181920imu; Mon, 28 Jan 2019 19:23:28 -0800 (PST) X-Google-Smtp-Source: ALg8bN6Sk4SfUvI0pPW+JAV4yjS8phkW7d+rD1oMuyj52vuz+zB16U5IE8bMnNplbRGOX2h9Ek7L X-Received: by 2002:a62:8949:: with SMTP id v70mr23878302pfd.85.1548732208741; Mon, 28 Jan 2019 19:23:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548732208; cv=none; d=google.com; s=arc-20160816; b=o4VzUTka7OXfiSOPMM21vOhdxfCMFRJ0+zqq6Ue/c+fSkCHoRRZZ3JVbk6kRtS4eHh DuNWoyEKiGjIoEDt1VCaVu4arSw9br7I0weqBEJi+OHF5QXR/vItL7JHGP0duontzpr9 DL55y22ZbOh5sfIGap8hYyZn5dsmFNB+viFVOW5vyGywDuyNcw+seErJqTeYWi+wejnW +QoaqFFi/r8JGp04gkf0yCUDPpF8hvnMJ1GKQOOHuRdJh7qZTRIkncIHSMYKVa/cGjBW gnGFK5hj9cfB0xB1XjDBhQjXsUxl1lhVNV74zqO7vd+l75jTDkV/8SknV75dODLVproO 34Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=C+DoShMMLn2ryDkdNNlDhX7vqRfCx6n1/tD6/fWghYw=; b=aclVt21KpDetM7BtJiNhxTQ/3arhEXFjPyS1Vjco3dTxFPhRtC3W99SLB0GxculV0t tXoC4NwaOym7af4SU6UwExYjYRKo1zifUzqt0j6ZbK9xeqS9yaK84psTL38k4vDCU20o BirbYPRkjBGo15BVHKhHmIxmKzeWF6e3sQPwa3lbBC8cRYaNKnbgPrmayxkFUcT5OYrA EtIrmbHJL+X1NkDxGrWfvu3dMU3QV29OTgKr+zcx+FZRk9Ga3jChTbkRxAs8T2NQnSwz IJWY4JxLSi0uFbAuzt/1CguSIvS19fQ5nBKJBCzTWUoKrjG6+lLXnU+DGLfhMO+D5HfK 9nXg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f127si32911218pfc.69.2019.01.28.19.23.13; Mon, 28 Jan 2019 19:23:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727550AbfA2DWt (ORCPT + 99 others); Mon, 28 Jan 2019 22:22:49 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3228 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727142AbfA2DWt (ORCPT ); Mon, 28 Jan 2019 22:22:49 -0500 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 9A0ECBF8FD7982B94DBC; Tue, 29 Jan 2019 11:22:47 +0800 (CST) Received: from localhost (10.177.31.96) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.408.0; Tue, 29 Jan 2019 11:22:40 +0800 From: YueHaibing To: , , , , CC: , , , YueHaibing Subject: [PATCH v2 1/2] iwlwifi: Use kmemdup instead of duplicating its function Date: Tue, 29 Jan 2019 11:21:43 +0800 Message-ID: <20190129032144.18120-2-yuehaibing@huawei.com> X-Mailer: git-send-email 2.10.2.windows.1 In-Reply-To: <20190129032144.18120-1-yuehaibing@huawei.com> References: <20190129032144.18120-1-yuehaibing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.177.31.96] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use kmemdup rather than duplicating its implementation Signed-off-by: YueHaibing --- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index d9afedc..569cc50 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -1196,13 +1196,9 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, regd_to_copy = sizeof(struct ieee80211_regdomain) + valid_rules * sizeof(struct ieee80211_reg_rule); - copy_rd = kzalloc(regd_to_copy, GFP_KERNEL); - if (!copy_rd) { + copy_rd = kmemdup(regd, regd_to_copy, GFP_KERNEL); + if (!copy_rd) copy_rd = ERR_PTR(-ENOMEM); - goto out; - } - - memcpy(copy_rd, regd, regd_to_copy); out: kfree(regdb_ptrs); -- 2.7.4