From patchwork Tue Aug 28 18:45:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10578937 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 02D0314E1 for ; Tue, 28 Aug 2018 18:45:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7F842AA8E for ; Tue, 28 Aug 2018 18:45:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC46D2AA92; Tue, 28 Aug 2018 18:45:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_SBL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C7F22AA8E for ; Tue, 28 Aug 2018 18:45:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727130AbeH1Wid (ORCPT ); Tue, 28 Aug 2018 18:38:33 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:41623 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726961AbeH1Wid (ORCPT ); Tue, 28 Aug 2018 18:38:33 -0400 Received: by mail-pg1-f196.google.com with SMTP id s15-v6so1137295pgv.8 for ; Tue, 28 Aug 2018 11:45:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=SRaj3JSgyvYOuQwsqLUFp7psj4vWZSNaB3l4JnePWQ4=; b=LQKCEZBrYiwPeWzC/OKq52PTtw+oMiKo4Cb7QwRUKUZQMnFzIvh7/94oB6Qz6Ut9xB YYCwCZRaMr0SpIBM26Zzws992aY8Pnuwj03/R/Run4meLb7sEW3ZNiJ1+Ov1HabTikP6 drzqMJ9IwSTi3UwgFOHODvWqYltUujhFWYRgzqZqoVcN3BVYNdL3XfdiMETiYzAB/tN+ 5tjjpfR+ssClroIWgdMPyuo0Ma46kwZQIZ/cF32OAgC13tXQ0R4rER/oK2sp110eHfr7 0KKMtjfYBMZswPTomo5OrXzlY9g7nT7Pr4c8cjNpvVtpo0LYP9NssUu6POdGrrROhCxu lVlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=SRaj3JSgyvYOuQwsqLUFp7psj4vWZSNaB3l4JnePWQ4=; b=aj549Xyee2sdDsoO46p2YlfLgQCKnqs4NCBy5DpHaqo4uOcI2bu0nPtmr3aABaRVTd WHupoGz6hcjvHt7UwKTLSkXlRILsjvdnNAWFZ9eT0l8YZo/yhUf6G6GxghGxdajMU38D KeprCuzG3NrbHpbblaO6dEI5AtPN+INLEqu1JLXY05IIvFaPaycq3m3mpqvy88OchrXA Lz8RcyfDvscbDNMIWbHyARuDTVd7PkRC1yYvZZAzirsRPRsqcnqcp0WUsrpwwbTihfO1 s4yn9DIBuaAkD8tr2MbZ248FAk3P9U3x+dqIph2Jbo/qUbEO58YgpAY8pj/zeCpWoIlv 614g== X-Gm-Message-State: APzg51Be2kaBhoi+NDYTx2o/qgcytk0qSy8PzBIcBTO5pQXmYTdKW7c3 6WvX8c49MjSAlKYNQQGo/pgX/Har X-Google-Smtp-Source: ANB0VdZm5rsNRa5WLcR7mznT+DibCpg0/5MdNIG6TdJfe3llnDN/Kuko2Eoqs/j74A1ascXi8YhqXA== X-Received: by 2002:a62:280a:: with SMTP id o10-v6mr2729073pfo.129.1535481937194; Tue, 28 Aug 2018 11:45:37 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id z22-v6sm3028093pgc.67.2018.08.28.11.45.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Aug 2018 11:45:36 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH] hwmon: (iio_hwmon) Do not duplicate or sanitize fixed string Date: Tue, 28 Aug 2018 11:45:35 -0700 Message-Id: <1535481935-28226-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Calling devm_kstrdup() on a fixed string is unnecessary, as is validating its contents. Rearrange the code to avoid both. Signed-off-by: Guenter Roeck --- drivers/hwmon/iio_hwmon.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c index 7566991f1c04..eed66e533ee2 100644 --- a/drivers/hwmon/iio_hwmon.c +++ b/drivers/hwmon/iio_hwmon.c @@ -137,14 +137,15 @@ static int iio_hwmon_probe(struct platform_device *pdev) st->attr_group.attrs = st->attrs; st->groups[0] = &st->attr_group; - if (dev->of_node) + if (dev->of_node) { sname = devm_kasprintf(dev, GFP_KERNEL, "%pOFn", dev->of_node); - else - sname = devm_kstrdup(dev, "iio_hwmon", GFP_KERNEL); - if (!sname) - return -ENOMEM; + if (!sname) + return -ENOMEM; + strreplace(sname, '-', '_'); + } else { + sname = "iio_hwmon"; + } - strreplace(sname, '-', '_'); hwmon_dev = devm_hwmon_device_register_with_groups(dev, sname, st, st->groups); return PTR_ERR_OR_ZERO(hwmon_dev);