From patchwork Thu Nov 4 18:50:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ma=C3=ADra_Canal?= X-Patchwork-Id: 12603667 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A92EC433EF for ; Thu, 4 Nov 2021 18:50:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 057F060EBD for ; Thu, 4 Nov 2021 18:50:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232153AbhKDSxG (ORCPT ); Thu, 4 Nov 2021 14:53:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231757AbhKDSxE (ORCPT ); Thu, 4 Nov 2021 14:53:04 -0400 Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E59CDC061203 for ; Thu, 4 Nov 2021 11:50:25 -0700 (PDT) Received: by mail-qk1-x72b.google.com with SMTP id bj27so4978528qkb.11 for ; Thu, 04 Nov 2021 11:50:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :content-transfer-encoding; bh=oSIkf0OBVIKHsiRflQs3qBY9N9D25QVn/L+ip9zPG0M=; b=JnB7Nezi9c6EVYLCOSBafzIJoUEf06ZJD2JkrqTkFmnDAt36E3n4XYngMhcTGR6bjy CK47tGOWh7e4hV6lp9/E28w9ElDJF+NQ4x4P1BgexczvBaMLwEtJ3Sh5o4UWWBy1HKx0 TRVMB3QW4aG2rbvgdfJLA0eVTCozDJiJu41USj+pYb2xFCqEgvywGbb5Rg4gBCBeKwLE WZDHnGY8GNLmazHu0V6E0sW7mR1Nt3A7ApuGhVML67wH6HaSb0iMtxZX1fuUzCvYaZaW vBJAFVL0zzTG9+yaOW4ogMzY5Pn/jd4ldegpFV0vld1hyUSXddMdmyTktLbj9FI20pJq TzsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:content-transfer-encoding; bh=oSIkf0OBVIKHsiRflQs3qBY9N9D25QVn/L+ip9zPG0M=; b=sWBB8jyIMNmWDCOwrlwAAa/CToajSNV+hbAqJSdpy6yXwtVw/2Ix6zCjGa5DCt1xH7 kslW2Ye4ftCujStUDheg60y542Lf/tcXApTzt10i88OrdXc7MgyjEk3qk4eNfps+JEu8 RtaR4A1vHJLOTHOMvtuXFbi8i25SGu9CnA+InysUQgtopncH53g8eFIyyJG9r1uu78Vb YnSZclkxL4mrqEari6DsV9o9bgIQW9/QoX7zWTLUmzaUNePCyRDnTT5oAM7zRBmfSepB uNCvUHYHevsLW/rKJAu/cvmYrQvaU4yJD8VwsOcbfJmsBoeB5EHsQUUEGr6sBUptQWMV 8hiQ== X-Gm-Message-State: AOAM532jphfAxhKmBKJTpaOV1W8jcxJCIzU5/JwOsjRtFIkPi595DPRY ANehcP/rKBY6y/TlNZqX1GAZiA== X-Google-Smtp-Source: ABdhPJxAFXqaPyN8lvZ2B3OvO3LFlEpDqRLxXtmDaev1jGiweXgxtvEQfgUDeJmHRd6bh5JDavYRxg== X-Received: by 2002:a37:f90a:: with SMTP id l10mr41017877qkj.402.1636051825113; Thu, 04 Nov 2021 11:50:25 -0700 (PDT) Received: from fedora ([187.64.134.142]) by smtp.gmail.com with ESMTPSA id f3sm4462330qtf.55.2021.11.04.11.50.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Nov 2021 11:50:23 -0700 (PDT) Date: Thu, 4 Nov 2021 15:50:18 -0300 From: =?iso-8859-1?q?Ma=EDra?= Canal To: sean@mess.org, mchehab@kernel.org, thierry.reding@gmail.com, u.kleine-koenig@pengutronix.de, lee.jones@linaro.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org Subject: [PATCH v3] media: ir-rx51: Switch to atomic PWM API Message-ID: MIME-Version: 1.0 Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Remove legacy PWM interface (pwm_config, pwm_enable, pwm_disable) and replace it for the atomic PWM API. Signed-off-by: Maíra Canal Reviewed-by: Uwe Kleine-König --- V1 -> V2: Remove conceptually wrong chunk of code and correct the position of pwm_init_state function V2 -> V3: Fix NULL pointer exception --- drivers/media/rc/ir-rx51.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c index a0d9c02a7588..a3b145183260 100644 --- a/drivers/media/rc/ir-rx51.c +++ b/drivers/media/rc/ir-rx51.c @@ -19,6 +19,7 @@ struct ir_rx51 { struct rc_dev *rcdev; struct pwm_device *pwm; + struct pwm_state state; struct hrtimer timer; struct device *dev; wait_queue_head_t wqueue; @@ -32,22 +33,20 @@ struct ir_rx51 { static inline void ir_rx51_on(struct ir_rx51 *ir_rx51) { - pwm_enable(ir_rx51->pwm); + ir_rx51->state.enabled = true; + pwm_apply_state(ir_rx51->pwm, &ir_rx51->state); } static inline void ir_rx51_off(struct ir_rx51 *ir_rx51) { - pwm_disable(ir_rx51->pwm); + ir_rx51->state.enabled = false; + pwm_apply_state(ir_rx51->pwm, &ir_rx51->state); } static int init_timing_params(struct ir_rx51 *ir_rx51) { - struct pwm_device *pwm = ir_rx51->pwm; - int duty, period = DIV_ROUND_CLOSEST(NSEC_PER_SEC, ir_rx51->freq); - - duty = DIV_ROUND_CLOSEST(ir_rx51->duty_cycle * period, 100); - - pwm_config(pwm, duty, period); + ir_rx51->state.period = DIV_ROUND_CLOSEST(NSEC_PER_SEC, ir_rx51->freq); + pwm_set_relative_duty_cycle(&ir_rx51->state, ir_rx51->duty_cycle, 100); return 0; } @@ -242,6 +241,7 @@ static int ir_rx51_probe(struct platform_device *dev) /* Use default, in case userspace does not set the carrier */ ir_rx51.freq = DIV_ROUND_CLOSEST_ULL(pwm_get_period(pwm), NSEC_PER_SEC); + pwm_init_state(pwm, &ir_rx51.state); pwm_put(pwm); hrtimer_init(&ir_rx51.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);