linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: david.wu@rock-chips.com (David Wu)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/7] pwm: rockchip: Remove the dumplicate rockchip_pwm_ops ops
Date: Sat,  8 Jul 2017 12:03:45 +0800	[thread overview]
Message-ID: <1499486629-9659-4-git-send-email-david.wu@rock-chips.com> (raw)
In-Reply-To: <1499486629-9659-1-git-send-email-david.wu@rock-chips.com>

The rockchip_pwm_ops_v1 and rockchip_pwm_ops_v2 ops are the same
struct members, remove one of them.

Signed-off-by: David Wu <david.wu@rock-chips.com>
---
 drivers/pwm/pwm-rockchip.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c
index cd45f17..85f9515 100644
--- a/drivers/pwm/pwm-rockchip.c
+++ b/drivers/pwm/pwm-rockchip.c
@@ -255,13 +255,7 @@ static int rockchip_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
 	return ret;
 }
 
-static const struct pwm_ops rockchip_pwm_ops_v1 = {
-	.get_state = rockchip_pwm_get_state,
-	.apply = rockchip_pwm_apply,
-	.owner = THIS_MODULE,
-};
-
-static const struct pwm_ops rockchip_pwm_ops_v2 = {
+static const struct pwm_ops rockchip_pwm_ops = {
 	.get_state = rockchip_pwm_get_state,
 	.apply = rockchip_pwm_apply,
 	.owner = THIS_MODULE,
@@ -275,7 +269,7 @@ static int rockchip_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
 		.ctrl = 0x0c,
 	},
 	.prescaler = 2,
-	.ops = &rockchip_pwm_ops_v1,
+	.ops = &rockchip_pwm_ops,
 	.set_enable = rockchip_pwm_set_enable_v1,
 	.get_state = rockchip_pwm_get_state_v1,
 };
@@ -289,7 +283,7 @@ static int rockchip_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
 	},
 	.prescaler = 1,
 	.supports_polarity = true,
-	.ops = &rockchip_pwm_ops_v2,
+	.ops = &rockchip_pwm_ops,
 	.set_enable = rockchip_pwm_set_enable_v2,
 	.get_state = rockchip_pwm_get_state_v2,
 };
@@ -303,7 +297,7 @@ static int rockchip_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
 	},
 	.prescaler = 1,
 	.supports_polarity = true,
-	.ops = &rockchip_pwm_ops_v2,
+	.ops = &rockchip_pwm_ops,
 	.set_enable = rockchip_pwm_set_enable_v2,
 	.get_state = rockchip_pwm_get_state_v2,
 };
-- 
1.9.1

  parent reply	other threads:[~2017-07-08  4:03 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-08  4:03 [PATCH v2 0/7] Add rk3328 pwm support David Wu
2017-07-08  4:03 ` [PATCH v2 1/7] pwm: rockchip: Add APB and function both clocks support David Wu
2017-07-11 17:03   ` Doug Anderson
2017-07-12  8:38     ` David.Wu
2017-07-12 19:09       ` Heiko Stübner
2017-07-08  4:03 ` [PATCH v2 2/7] pwm: rockchip: Remove the judge from return value of pwm_config David Wu
2017-07-08  4:03 ` David Wu [this message]
2017-08-02  8:59   ` [PATCH v2 3/7] pwm: rockchip: Remove the dumplicate rockchip_pwm_ops ops Boris Brezillon
2017-08-02 11:31     ` David.Wu
2017-08-02 11:40       ` Boris Brezillon
2017-08-04  2:38         ` David.Wu
2017-08-04  7:09           ` Boris Brezillon
2017-08-08 15:41             ` David.Wu
2017-07-08  4:03 ` [PATCH v2 4/7] pwm: rockchip: Use pwm_apply instead of the pwm_enable David Wu
2017-07-08  4:08 ` [PATCH v2 5/7] pwm: rockchip: Move the configuration of polarity from rockchip_pwm_set_enable() to rockchip_pwm_config() David Wu
2017-07-08  4:09 ` [PATCH v2 6/7] pwm: rockchip: Add rk3328 pwm support David Wu
2017-07-08  4:10 ` [PATCH v2 7/7] arm64: dts: rockchip: Add pwm nodes for rk3328 David Wu
2017-07-08  4:25 ` [RESEND PATCH v2 6/7] pwm: rockchip: Add rk3328 pwm support David Wu
2017-08-02  8:46 ` [PATCH v2 0/7] " David.Wu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1499486629-9659-4-git-send-email-david.wu@rock-chips.com \
    --to=david.wu@rock-chips.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).