Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2c95e47 authored by Thierry Reding's avatar Thierry Reding
Browse files

pwm: tiehrpwm: Miscellaneous coding style fixups 



I noticed most of these while reviewing another patch and thought I'd
fix them while at it. These are mostly changes to make variable types
more strict and whitespace fixups.

Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 23f373e6

drivers/pwm/pwm-tiehrpwm.c

+62 −50
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ struct ehrpwm_context { 


struct ehrpwm_pwm_chip {

	struct pwm_chip chip;

	unsigned int	clk_rate;

	unsigned long clk_rate;

	void __iomem *mmio_base;

	unsigned long period_cycles[NUM_PWM_CHANNEL];

	enum pwm_polarity polarity[NUM_PWM_CHANNEL];
@@ -136,25 +136,26 @@ static inline struct ehrpwm_pwm_chip *to_ehrpwm_pwm_chip(struct pwm_chip *chip) 
	return container_of(chip, struct ehrpwm_pwm_chip, chip);

}



static inline u16 ehrpwm_read(void __iomem *base, int offset)

static inline u16 ehrpwm_read(void __iomem *base, unsigned int offset)

{

	return readw(base + offset);

}



static inline void ehrpwm_write(void __iomem *base, int offset, unsigned int val)

static inline void ehrpwm_write(void __iomem *base, unsigned int offset,

				u16 value)

{

	writew(val & 0xFFFF, base + offset);

	writew(value, base + offset);

}



static void ehrpwm_modify(void __iomem *base, int offset,

		unsigned short mask, unsigned short val)

static void ehrpwm_modify(void __iomem *base, unsigned int offset, u16 mask,

			  u16 value)

{

	unsigned short regval;

	unsigned short val;



	regval = readw(base + offset);

	regval &= ~mask;

	regval |= val & mask;

	writew(regval, base + offset);

	val = readw(base + offset);

	val &= ~mask;

	val |= value & mask;

	writew(val, base + offset);

}



/**
@@ -163,14 +164,13 @@ static void ehrpwm_modify(void __iomem *base, int offset, 
 * @prescale_div:	prescaler value set

 * @tb_clk_div:		Time Base Control prescaler bits

 */

static int set_prescale_div(unsigned long rqst_prescaler,

		unsigned short *prescale_div, unsigned short *tb_clk_div)

static int set_prescale_div(unsigned long rqst_prescaler, u16 *prescale_div,

			    u16 *tb_clk_div)

{

	unsigned int clkdiv, hspclkdiv;



	for (clkdiv = 0; clkdiv <= CLKDIV_MAX; clkdiv++) {

		for (hspclkdiv = 0; hspclkdiv <= HSPCLKDIV_MAX; hspclkdiv++) {



			/*

			 * calculations for prescaler value :

			 * prescale_div = HSPCLKDIVIDER * CLKDIVIDER.
@@ -191,13 +191,14 @@ static int set_prescale_div(unsigned long rqst_prescaler, 
			}

		}

	}



	return 1;

}



static void configure_polarity(struct ehrpwm_pwm_chip *pc, int chan)

{

	int aqctl_reg;

	unsigned short aqctl_val, aqctl_mask;

	u16 aqctl_val, aqctl_mask;

	unsigned int aqctl_reg;



	/*

	 * Configure PWM output to HIGH/LOW level on counter
@@ -235,10 +236,10 @@ static int ehrpwm_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, 
			     int duty_ns, int period_ns)

{

	struct ehrpwm_pwm_chip *pc = to_ehrpwm_pwm_chip(chip);

	u32 period_cycles, duty_cycles;

	u16 ps_divval, tb_divval;

	unsigned int i, cmp_reg;

	unsigned long long c;

	unsigned long period_cycles, duty_cycles;

	unsigned short ps_divval, tb_divval;

	int i, cmp_reg;



	if (period_ns > NSEC_PER_SEC)

		return -ERANGE;
@@ -272,7 +273,8 @@ static int ehrpwm_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, 
			if (i == pwm->hwpwm)

				continue;



			dev_err(chip->dev, "Period value conflicts with channel %d\n",

			dev_err(chip->dev,

				"period value conflicts with channel %u\n",

				i);

			return -EINVAL;

		}
@@ -315,23 +317,26 @@ static int ehrpwm_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, 
	ehrpwm_write(pc->mmio_base, cmp_reg, duty_cycles);



	pm_runtime_put_sync(chip->dev);



	return 0;

}



static int ehrpwm_pwm_set_polarity(struct pwm_chip *chip,

		struct pwm_device *pwm,	enum pwm_polarity polarity)

				   struct pwm_device *pwm,

				   enum pwm_polarity polarity)

{

	struct ehrpwm_pwm_chip *pc = to_ehrpwm_pwm_chip(chip);



	/* Configuration of polarity in hardware delayed, do at enable */

	pc->polarity[pwm->hwpwm] = polarity;



	return 0;

}



static int ehrpwm_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)

{

	struct ehrpwm_pwm_chip *pc = to_ehrpwm_pwm_chip(chip);

	unsigned short aqcsfrc_val, aqcsfrc_mask;

	u16 aqcsfrc_val, aqcsfrc_mask;

	int ret;



	/* Leave clock enabled on enabling PWM */
@@ -358,20 +363,21 @@ static int ehrpwm_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) 
	/* Enable TBCLK before enabling PWM device */

	ret = clk_enable(pc->tbclk);

	if (ret) {

		dev_err(chip->dev, "Failed to enable TBCLK for %s\n",

			dev_name(pc->chip.dev));

		dev_err(chip->dev, "Failed to enable TBCLK for %s: %d\n",

			dev_name(pc->chip.dev), ret);

		return ret;

	}



	/* Enable time counter for free_run */

	ehrpwm_modify(pc->mmio_base, TBCTL, TBCTL_RUN_MASK, TBCTL_FREE_RUN);



	return 0;

}



static void ehrpwm_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)

{

	struct ehrpwm_pwm_chip *pc = to_ehrpwm_pwm_chip(chip);

	unsigned short aqcsfrc_val, aqcsfrc_mask;

	u16 aqcsfrc_val, aqcsfrc_mask;



	/* Action Qualifier puts PWM output low forcefully */

	if (pwm->hwpwm) {
@@ -433,10 +439,10 @@ MODULE_DEVICE_TABLE(of, ehrpwm_of_match); 
static int ehrpwm_pwm_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	int ret;

	struct ehrpwm_pwm_chip *pc;

	struct resource *r;

	struct clk *clk;

	struct ehrpwm_pwm_chip *pc;

	int ret;



	pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL);

	if (!pc)
@@ -510,6 +516,7 @@ static int ehrpwm_pwm_remove(struct platform_device *pdev) 
	clk_unprepare(pc->tbclk);



	pm_runtime_disable(&pdev->dev);



	return pwmchip_remove(&pc->chip);

}
@@ -517,6 +524,7 @@ static int ehrpwm_pwm_remove(struct platform_device *pdev) 
static void ehrpwm_pwm_save_context(struct ehrpwm_pwm_chip *pc)

{

	pm_runtime_get_sync(pc->chip.dev);



	pc->ctx.tbctl = ehrpwm_read(pc->mmio_base, TBCTL);

	pc->ctx.tbprd = ehrpwm_read(pc->mmio_base, TBPRD);

	pc->ctx.cmpa = ehrpwm_read(pc->mmio_base, CMPA);
@@ -525,6 +533,7 @@ static void ehrpwm_pwm_save_context(struct ehrpwm_pwm_chip *pc) 
	pc->ctx.aqctlb = ehrpwm_read(pc->mmio_base, AQCTLB);

	pc->ctx.aqsfrc = ehrpwm_read(pc->mmio_base, AQSFRC);

	pc->ctx.aqcsfrc = ehrpwm_read(pc->mmio_base, AQCSFRC);



	pm_runtime_put_sync(pc->chip.dev);

}
@@ -543,9 +552,10 @@ static void ehrpwm_pwm_restore_context(struct ehrpwm_pwm_chip *pc) 
static int ehrpwm_pwm_suspend(struct device *dev)

{

	struct ehrpwm_pwm_chip *pc = dev_get_drvdata(dev);

	int i;

	unsigned int i;



	ehrpwm_pwm_save_context(pc);



	for (i = 0; i < pc->chip.npwm; i++) {

		struct pwm_device *pwm = &pc->chip.pwms[i];
@@ -555,13 +565,14 @@ static int ehrpwm_pwm_suspend(struct device *dev) 
		/* Disable explicitly if PWM is running */

		pm_runtime_put_sync(dev);

	}



	return 0;

}



static int ehrpwm_pwm_resume(struct device *dev)

{

	struct ehrpwm_pwm_chip *pc = dev_get_drvdata(dev);

	int i;

	unsigned int i;



	for (i = 0; i < pc->chip.npwm; i++) {

		struct pwm_device *pwm = &pc->chip.pwms[i];
@@ -572,7 +583,9 @@ static int ehrpwm_pwm_resume(struct device *dev) 
		/* Enable explicitly if PWM was running */

		pm_runtime_get_sync(dev);

	}



	ehrpwm_pwm_restore_context(pc);



	return 0;

}

#endif
@@ -589,7 +602,6 @@ static struct platform_driver ehrpwm_pwm_driver = { 
	.probe = ehrpwm_pwm_probe,

	.remove = ehrpwm_pwm_remove,

};



module_platform_driver(ehrpwm_pwm_driver);



MODULE_DESCRIPTION("EHRPWM PWM driver");