* [PATCH 0/3] MFD/Input: twl6040 (vibra): cleanups
@ 2011-09-02 14:32 Peter Ujfalusi
2011-09-02 14:32 ` [PATCH 1/3] MFD: twl6040: Remove global pointer for platform_device Peter Ujfalusi
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Peter Ujfalusi @ 2011-09-02 14:32 UTC (permalink / raw)
To: Samuel Ortiz, Dmitry Torokhov, Misael Lopez Cruz
Cc: linux-input, linux-kernel
Hello,
Small cleanups for the twl6040 MFD driver:
removing the global pointer for the platform_device, and adding accessor
to fetch the revision ID of the IC.
Peter
---
Peter Ujfalusi (3):
MFD: twl6040: Remove global pointer for platform_device
MFD: twl6040: Add accessor for revision ID
Input: twl6040-vibra: Use accessor to get revision information
drivers/input/misc/twl6040-vibra.c | 2 +-
drivers/mfd/twl6040-core.c | 27 +++++++++++----------------
include/linux/mfd/twl6040.h | 5 +++++
3 files changed, 17 insertions(+), 17 deletions(-)
--
1.7.6.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] MFD: twl6040: Remove global pointer for platform_device
2011-09-02 14:32 [PATCH 0/3] MFD/Input: twl6040 (vibra): cleanups Peter Ujfalusi
@ 2011-09-02 14:32 ` Peter Ujfalusi
2011-09-02 14:32 ` [PATCH 2/3] MFD: twl6040: Add accessor for revision ID Peter Ujfalusi
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Peter Ujfalusi @ 2011-09-02 14:32 UTC (permalink / raw)
To: Samuel Ortiz, Dmitry Torokhov, Misael Lopez Cruz
Cc: linux-input, linux-kernel
There is no need to keep global pointer for the platform
device, since it is only used for dev_* prints, and the
device pointer available within the twl6040 structure.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/mfd/twl6040-core.c | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index 24d436c..b0519e6 100644
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -34,8 +34,6 @@
#include <linux/mfd/core.h>
#include <linux/mfd/twl6040.h>
-static struct platform_device *twl6040_dev;
-
int twl6040_reg_read(struct twl6040 *twl6040, unsigned int reg)
{
int ret;
@@ -203,11 +201,11 @@ static irqreturn_t twl6040_naudint_handler(int irq, void *data)
if (intid & TWL6040_THINT) {
status = twl6040_reg_read(twl6040, TWL6040_REG_STATUS);
if (status & TWL6040_TSHUTDET) {
- dev_warn(&twl6040_dev->dev,
+ dev_warn(twl6040->dev,
"Thermal shutdown, powering-off");
twl6040_power(twl6040, 0);
} else {
- dev_warn(&twl6040_dev->dev,
+ dev_warn(twl6040->dev,
"Leaving thermal shutdown, powering-on");
twl6040_power(twl6040, 1);
}
@@ -227,7 +225,7 @@ static int twl6040_power_up_completion(struct twl6040 *twl6040,
if (!time_left) {
intid = twl6040_reg_read(twl6040, TWL6040_REG_INTID);
if (!(intid & TWL6040_READYINT)) {
- dev_err(&twl6040_dev->dev,
+ dev_err(twl6040->dev,
"timeout waiting for READYINT\n");
return -ETIMEDOUT;
}
@@ -255,7 +253,7 @@ int twl6040_power(struct twl6040 *twl6040, int on)
/* wait for power-up completion */
ret = twl6040_power_up_completion(twl6040, naudint);
if (ret) {
- dev_err(&twl6040_dev->dev,
+ dev_err(twl6040->dev,
"automatic power-down failed\n");
twl6040->power_count = 0;
goto out;
@@ -264,7 +262,7 @@ int twl6040_power(struct twl6040 *twl6040, int on)
/* use manual power-up sequence */
ret = twl6040_power_up(twl6040);
if (ret) {
- dev_err(&twl6040_dev->dev,
+ dev_err(twl6040->dev,
"manual power-up failed\n");
twl6040->power_count = 0;
goto out;
@@ -276,7 +274,7 @@ int twl6040_power(struct twl6040 *twl6040, int on)
} else {
/* already powered-down */
if (!twl6040->power_count) {
- dev_err(&twl6040_dev->dev,
+ dev_err(twl6040->dev,
"device is already powered-off\n");
ret = -EPERM;
goto out;
@@ -326,7 +324,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
lppllctl &= ~TWL6040_LPLLFIN;
break;
default:
- dev_err(&twl6040_dev->dev,
+ dev_err(twl6040->dev,
"freq_out %d not supported\n", freq_out);
ret = -EINVAL;
goto pll_out;
@@ -347,7 +345,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
hppllctl);
break;
default:
- dev_err(&twl6040_dev->dev,
+ dev_err(twl6040->dev,
"freq_in %d not supported\n", freq_in);
ret = -EINVAL;
goto pll_out;
@@ -356,7 +354,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
case TWL6040_SYSCLK_SEL_HPPLL:
/* high-performance PLL can provide only 19.2 MHz */
if (freq_out != 19200000) {
- dev_err(&twl6040_dev->dev,
+ dev_err(twl6040->dev,
"freq_out %d not supported\n", freq_out);
ret = -EINVAL;
goto pll_out;
@@ -389,7 +387,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
TWL6040_HPLLENA;
break;
default:
- dev_err(&twl6040_dev->dev,
+ dev_err(twl6040->dev,
"freq_in %d not supported\n", freq_in);
ret = -EINVAL;
goto pll_out;
@@ -406,7 +404,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL, lppllctl);
break;
default:
- dev_err(&twl6040_dev->dev, "unknown pll id %d\n", pll_id);
+ dev_err(twl6040->dev, "unknown pll id %d\n", pll_id);
ret = -EINVAL;
goto pll_out;
}
@@ -471,7 +469,6 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, twl6040);
- twl6040_dev = pdev;
twl6040->dev = &pdev->dev;
twl6040->audpwron = pdata->audpwron_gpio;
twl6040->irq = pdata->naudint_irq;
@@ -566,7 +563,6 @@ gpio2_err:
gpio1_err:
platform_set_drvdata(pdev, NULL);
kfree(twl6040);
- twl6040_dev = NULL;
return ret;
}
@@ -586,7 +582,6 @@ static int __devexit twl6040_remove(struct platform_device *pdev)
mfd_remove_devices(&pdev->dev);
platform_set_drvdata(pdev, NULL);
kfree(twl6040);
- twl6040_dev = NULL;
return 0;
}
--
1.7.6.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] MFD: twl6040: Add accessor for revision ID
2011-09-02 14:32 [PATCH 0/3] MFD/Input: twl6040 (vibra): cleanups Peter Ujfalusi
2011-09-02 14:32 ` [PATCH 1/3] MFD: twl6040: Remove global pointer for platform_device Peter Ujfalusi
@ 2011-09-02 14:32 ` Peter Ujfalusi
2011-09-02 14:32 ` [PATCH 3/3] Input: twl6040-vibra: Use accessor to get revision information Peter Ujfalusi
2011-09-02 14:47 ` [PATCH 0/3] MFD/Input: twl6040 (vibra): cleanups Ujfalusi, Peter
3 siblings, 0 replies; 5+ messages in thread
From: Peter Ujfalusi @ 2011-09-02 14:32 UTC (permalink / raw)
To: Samuel Ortiz, Dmitry Torokhov, Misael Lopez Cruz
Cc: linux-input, linux-kernel
For client driver to use, if they need chip resvision information.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
include/linux/mfd/twl6040.h | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 4c806f6..cb3b822 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -225,4 +225,9 @@ unsigned int twl6040_get_sysclk(struct twl6040 *twl6040);
int twl6040_irq_init(struct twl6040 *twl6040);
void twl6040_irq_exit(struct twl6040 *twl6040);
+static inline int twl6040_get_revid(struct twl6040 *twl6040)
+{
+ return twl6040->rev;
+}
+
#endif /* End of __TWL6040_CODEC_H__ */
--
1.7.6.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] Input: twl6040-vibra: Use accessor to get revision information
2011-09-02 14:32 [PATCH 0/3] MFD/Input: twl6040 (vibra): cleanups Peter Ujfalusi
2011-09-02 14:32 ` [PATCH 1/3] MFD: twl6040: Remove global pointer for platform_device Peter Ujfalusi
2011-09-02 14:32 ` [PATCH 2/3] MFD: twl6040: Add accessor for revision ID Peter Ujfalusi
@ 2011-09-02 14:32 ` Peter Ujfalusi
2011-09-02 14:47 ` [PATCH 0/3] MFD/Input: twl6040 (vibra): cleanups Ujfalusi, Peter
3 siblings, 0 replies; 5+ messages in thread
From: Peter Ujfalusi @ 2011-09-02 14:32 UTC (permalink / raw)
To: Samuel Ortiz, Dmitry Torokhov, Misael Lopez Cruz
Cc: linux-input, linux-kernel
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/input/misc/twl6040-vibra.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index c43002e..154b7a3 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -97,7 +97,7 @@ static void twl6040_vibra_enable(struct vibra_info *info)
}
twl6040_power(info->twl6040, 1);
- if (twl6040->rev <= TWL6040_REV_ES1_1) {
+ if (twl6040_get_revid(twl6040) <= TWL6040_REV_ES1_1) {
/*
* ERRATA: Disable overcurrent protection for at least
* 3ms when enabling vibrator drivers to avoid false
--
1.7.6.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] MFD/Input: twl6040 (vibra): cleanups
2011-09-02 14:32 [PATCH 0/3] MFD/Input: twl6040 (vibra): cleanups Peter Ujfalusi
` (2 preceding siblings ...)
2011-09-02 14:32 ` [PATCH 3/3] Input: twl6040-vibra: Use accessor to get revision information Peter Ujfalusi
@ 2011-09-02 14:47 ` Ujfalusi, Peter
3 siblings, 0 replies; 5+ messages in thread
From: Ujfalusi, Peter @ 2011-09-02 14:47 UTC (permalink / raw)
To: Samuel Ortiz, Dmitry Torokhov, Misael Lopez Cruz
Cc: linux-input, linux-kernel
Hello,
On Fri, Sep 2, 2011 at 5:32 PM, Peter Ujfalusi <peter.ujfalusi@ti.com> wrote:
> Hello,
>
> Small cleanups for the twl6040 MFD driver:
> removing the global pointer for the platform_device, and adding accessor
> to fetch the revision ID of the IC.
Please ignore this series, I have missed one place, where the
revision id is accessed within the twl6040-core driver.
I have also spotted one unrelated error in the core driver.
Will resend shortly.
--
Péter
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-09-02 14:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-02 14:32 [PATCH 0/3] MFD/Input: twl6040 (vibra): cleanups Peter Ujfalusi
2011-09-02 14:32 ` [PATCH 1/3] MFD: twl6040: Remove global pointer for platform_device Peter Ujfalusi
2011-09-02 14:32 ` [PATCH 2/3] MFD: twl6040: Add accessor for revision ID Peter Ujfalusi
2011-09-02 14:32 ` [PATCH 3/3] Input: twl6040-vibra: Use accessor to get revision information Peter Ujfalusi
2011-09-02 14:47 ` [PATCH 0/3] MFD/Input: twl6040 (vibra): cleanups Ujfalusi, Peter
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).