From patchwork Fri Aug 5 16:50:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 595856 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC983C282E7 for ; Fri, 5 Aug 2022 16:50:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240965AbiHEQuu (ORCPT ); Fri, 5 Aug 2022 12:50:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240858AbiHEQus (ORCPT ); Fri, 5 Aug 2022 12:50:48 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4151A22B3B for ; Fri, 5 Aug 2022 09:50:47 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id r1-20020a05600c35c100b003a326685e7cso4095247wmq.1 for ; Fri, 05 Aug 2022 09:50:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=3SdKoJam1KKdYl+ZS8hBn9qpHaB89KQkUoXzOnMw6QQ=; b=ORSNTqW0aszfvoeBRZnTDN41qOivzjx0F7rX23lt1kov76+r+OBDrFaxt4wmwzcWUs NKdLH0Fz08LJ5mJJoqiPOl/pmJugHcr/2KcYQI7HlGyMSxxyKMzWyAcOCyr7yini6nsp gBDVIqp5Td6qjdC4n5Qjv0I+l/yTc+wTGiOpArRM7PBEpSuHqC14XuCDT8K+Gj7kePp2 pbYtcsNB5dvDLQITfCgPDEw4vy5fF+J8ZB+UcF4wrB3sRnLcpos4/cwy+RZpsLY4V9g8 5Q//DmalwDPi7GpYN2Fqtvbl1R3t4Zvw97F2++ubl8a0ykLqKJ+Ut70tt4tsehB1sDrP BpJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=3SdKoJam1KKdYl+ZS8hBn9qpHaB89KQkUoXzOnMw6QQ=; b=Sm67kEjxh5Q3UZld+l57dh0ty9i/KEZNM2+DXMtPdwzGOFkovrCuYsE9UX39Ag4Tw8 HeLYa3merwCQfuIR+JmrCrkoKluHlNVjcVHapLhnXAAmHmVjDEVNhU5KUO+Ul3ejQiOO vkduu/2shfsZnd7RmL1AsyCQ7UbQ2JVoxShD2yHYc5Vh/ML7VHcZV4muSCpYlqXKotym OTJHFcKowa6UBmeu06Eq+faIGKgFMf5C6XJdPbBOYPH99yJMGXo5MzgZrKraDvfuidNz QyyuBwM5Bb9Y5yBZS3/Xhi0VbTSF5dHpyu2m8FbsCtIzdSa0afT47Xd9/iH2U/eb8+lK fhWA== X-Gm-Message-State: ACgBeo070ZaJ7KOAOg36OvMDe2JXv/08hkHerww2KQEb8Em8FrbxE5Yk oMTNgSC8tKBqrChz6TzADlgBGQ== X-Google-Smtp-Source: AA6agR4lUviTrRBkbUQ62ydSaj/VkxFS4e7xnlk9+JsVdn5/8IgUIxDpYvwBdHugKNjRyScN4Wf1dA== X-Received: by 2002:a05:600c:654:b0:3a4:ecd6:9aea with SMTP id p20-20020a05600c065400b003a4ecd69aeamr5370290wmm.66.1659718245804; Fri, 05 Aug 2022 09:50:45 -0700 (PDT) Received: from rainbowdash.office.codethink.co.uk ([167.98.27.226]) by smtp.gmail.com with ESMTPSA id h28-20020a05600c2cbc00b003a4f08495b7sm11325374wmc.34.2022.08.05.09.50.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Aug 2022 09:50:45 -0700 (PDT) From: Ben Dooks To: linux-pwm@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lee Jones , u.kleine-koenig@pengutronix.de, Thierry Reding , Krzysztof Kozlowski , Greentime Hu , jarkko.nikula@linux.intel.com, William Salmon , Jude Onyenegecha --subject-prefix=PATCH v3 , Ben Dooks Subject: [PATCH 3/8] pwm: move dwc memory alloc to own function Date: Fri, 5 Aug 2022 17:50:28 +0100 Message-Id: <20220805165033.140958-4-ben.dooks@sifive.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805165033.140958-1-ben.dooks@sifive.com> References: <20220805165033.140958-1-ben.dooks@sifive.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org In preparation for adding other bus support, move the allocation of the pwm struct out of the main driver code. Signed-off-by: Ben Dooks --- drivers/pwm/pwm-dwc.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/pwm/pwm-dwc.c b/drivers/pwm/pwm-dwc.c index c706ef9a7ba1..61f11e0a9319 100644 --- a/drivers/pwm/pwm-dwc.c +++ b/drivers/pwm/pwm-dwc.c @@ -196,13 +196,29 @@ static const struct pwm_ops dwc_pwm_ops = { .owner = THIS_MODULE, }; +static struct dwc_pwm *dwc_pwm_alloc(struct device *dev) +{ + struct dwc_pwm *dwc; + + dwc = devm_kzalloc(dev, sizeof(*dwc), GFP_KERNEL); + if (!dwc) + return NULL; + + dwc->chip.dev = dev; + dwc->chip.ops = &dwc_pwm_ops; + dwc->chip.npwm = DWC_TIMERS_TOTAL; + + dev_set_drvdata(dev, dwc); + return dwc; +} + static int dwc_pwm_probe(struct pci_dev *pci, const struct pci_device_id *id) { struct device *dev = &pci->dev; struct dwc_pwm *dwc; int ret; - dwc = devm_kzalloc(dev, sizeof(*dwc), GFP_KERNEL); + dwc = dwc_pwm_alloc(dev); if (!dwc) return -ENOMEM; @@ -226,12 +242,6 @@ static int dwc_pwm_probe(struct pci_dev *pci, const struct pci_device_id *id) return -ENOMEM; } - pci_set_drvdata(pci, dwc); - - dwc->chip.dev = dev; - dwc->chip.ops = &dwc_pwm_ops; - dwc->chip.npwm = DWC_TIMERS_TOTAL; - ret = pwmchip_add(&dwc->chip); if (ret) return ret;