[PATCH] pwm: pxa: Remove PWM_ID_BASE macro

[PATCH] pwm: pxa: Remove PWM_ID_BASE macro

[Axel Lin]

PWM_ID_BASE() is not used after convert to PWM framework, remove it.
Also update driver_data field of struct platform_device_id accordingly.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
This is v2 of [PATCH] pwm: pxa: Use driver_data field to store pwm_nr.
I change the subject line to meet the change in v2.

 drivers/pwm/pwm-pxa.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c
index b789882..dee6ab55 100644
--- a/drivers/pwm/pwm-pxa.c
+++ b/drivers/pwm/pwm-pxa.c
@@ -23,14 +23,13 @@
 #include <asm/div64.h>
 
 #define HAS_SECONDARY_PWM	0x10
-#define PWM_ID_BASE(d)		((d) & 0xf)
 
 static const struct platform_device_id pwm_id_table[] = {
 	/*   PWM    has_secondary_pwm? */
 	{ "pxa25x-pwm", 0 },
-	{ "pxa27x-pwm", 0 | HAS_SECONDARY_PWM },
-	{ "pxa168-pwm", 1 },
-	{ "pxa910-pwm", 1 },
+	{ "pxa27x-pwm", HAS_SECONDARY_PWM },
+	{ "pxa168-pwm", 0 },
+	{ "pxa910-pwm", 0 },
 	{ },
 };
 MODULE_DEVICE_TABLE(platform, pwm_id_table);
-- 
1.7.10.4

Re: [PATCH] pwm: pxa: Remove PWM_ID_BASE macro

[Eric Miao]

On Mon, Apr 1, 2013 at 3:41 PM, Axel Lin <axel.lin@ingics.com> wrote:
> PWM_ID_BASE() is not used after convert to PWM framework, remove it.
> Also update driver_data field of struct platform_device_id accordingly.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
> This is v2 of [PATCH] pwm: pxa: Use driver_data field to store pwm_nr.
> I change the subject line to meet the change in v2.
>
>  drivers/pwm/pwm-pxa.c |    7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c
> index b789882..dee6ab55 100644
> --- a/drivers/pwm/pwm-pxa.c
> +++ b/drivers/pwm/pwm-pxa.c
> @@ -23,14 +23,13 @@
>  #include <asm/div64.h>
>
>  #define HAS_SECONDARY_PWM      0x10
> -#define PWM_ID_BASE(d)         ((d) & 0xf)
>
>  static const struct platform_device_id pwm_id_table[] = {
>         /*   PWM    has_secondary_pwm? */
>         { "pxa25x-pwm", 0 },
> -       { "pxa27x-pwm", 0 | HAS_SECONDARY_PWM },
> -       { "pxa168-pwm", 1 },
> -       { "pxa910-pwm", 1 },
> +       { "pxa27x-pwm", HAS_SECONDARY_PWM },
> +       { "pxa168-pwm", 0 },
> +       { "pxa910-pwm", 0 },
>         { },
>  };
>  MODULE_DEVICE_TABLE(platform, pwm_id_table);

Looks good to me, Acked-by: Eric Miao <eric.y.miao@gmail.com>

Re: [PATCH] pwm: pxa: Remove PWM_ID_BASE macro

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 426 bytes --]

On Mon, Apr 01, 2013 at 03:41:22PM +0800, Axel Lin wrote:
> PWM_ID_BASE() is not used after convert to PWM framework, remove it.
> Also update driver_data field of struct platform_device_id accordingly.
> 
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
> This is v2 of [PATCH] pwm: pxa: Use driver_data field to store pwm_nr.
> I change the subject line to meet the change in v2.

Applied, thanks.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]