From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Samuel Ortiz <samuel.ortiz@intel.com>,
Dmitry Torokhov <dtor@mail.ru>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
Misael Lopez Cruz <misael.lopez@ti.com>
Subject: [PATCH 01/17] MFD: twl6040: Remove global pointer for platform_device
Date: Thu, 15 Sep 2011 15:39:23 +0300 [thread overview]
Message-ID: <1316090379-30760-2-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1316090379-30760-1-git-send-email-peter.ujfalusi@ti.com>
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
next prev parent reply other threads:[~2011-09-15 12:40 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-15 12:39 [PATCH 00/17] ASoC: twl6040: Cleanups and fixes Peter Ujfalusi
2011-09-15 12:39 ` Peter Ujfalusi [this message]
2011-09-18 16:37 ` [PATCH 01/17] MFD: twl6040: Remove global pointer for platform_device Samuel Ortiz
2011-09-19 22:17 ` [alsa-devel] " Mark Brown
2011-09-15 12:39 ` [PATCH 02/17] MFD: twl6040: Add accessor for revision ID Peter Ujfalusi
2011-09-18 16:37 ` Samuel Ortiz
2011-09-19 22:16 ` [alsa-devel] " Mark Brown
2011-09-15 12:39 ` [PATCH 03/17] Input: twl6040-vibra: Use accessor to get revision information Peter Ujfalusi
2011-09-19 22:16 ` [alsa-devel] " Mark Brown
2011-09-15 12:39 ` [PATCH 04/17] MFD: twl6040: Fix power on GPIO handling Peter Ujfalusi
2011-09-18 16:39 ` Samuel Ortiz
2011-09-19 22:16 ` [alsa-devel] " Mark Brown
2011-09-15 12:39 ` [PATCH 05/17] ASoC: twl6040: Chip initialization cleanup Peter Ujfalusi
2011-09-19 22:16 ` [alsa-devel] " Mark Brown
2011-09-15 12:39 ` [PATCH 06/17] ASoC: twl6040: Use chip defaults in the initial reg_cache Peter Ujfalusi
2011-09-19 22:17 ` [alsa-devel] " Mark Brown
2011-09-15 12:39 ` [PATCH 07/17] ASoC: twl6040: Lower the initial gains Peter Ujfalusi
2011-09-19 11:00 ` Mark Brown
2011-09-19 11:26 ` Péter Ujfalusi
2011-09-19 11:40 ` Mark Brown
2011-09-21 9:22 ` Péter Ujfalusi
2011-09-21 12:39 ` Mark Brown
2011-09-21 13:03 ` Péter Ujfalusi
2011-09-21 13:14 ` Péter Ujfalusi
2011-09-21 13:17 ` Mark Brown
2011-09-21 13:25 ` Péter Ujfalusi
2011-09-21 13:33 ` Mark Brown
2011-09-15 12:39 ` [PATCH 08/17] ASoC: twl6040: Fix comments for register names Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 09/17] ASoC: twl6040: Remove strings "NULL" from DAPM route Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 10/17] ASoC: twl6040: Introduce SW only shadow register Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 11/17] ASoC: twl6040: Earphone path correction Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 12/17] ASoC: twl6040: Use consistent names for Handsfree path Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 13/17] ASoC: twl6040: Use consistent names for Headset path Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 14/17] ASoC: twl6040: Support for AUX L/R output Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 15/17] ASoC: twl6040/sdp4430: Change legacy DAI name Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 16/17] ASoC/MFD: twl6040: Combine bit definitions for Headset control registers Peter Ujfalusi
2011-09-15 12:39 ` [PATCH 17/17] ASoC: twl6040: Workaround for headset DC offset caused pop noise Peter Ujfalusi
2011-09-16 9:19 ` [PATCH 00/17] ASoC: twl6040: Cleanups and fixes Liam Girdwood
2011-09-18 16:41 ` Samuel Ortiz
2011-09-19 10:12 ` [alsa-devel] " Mark Brown
2011-09-19 11:32 ` Péter Ujfalusi
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=1316090379-30760-2-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=dtor@mail.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=misael.lopez@ti.com \
--cc=samuel.ortiz@intel.com \
/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
all inboxes | Powered by JetHome®