* [PATCH 1/2] staging:iio:trigger: Use to_iio_trigger() instead of dev_get_drvdata()
@ 2012-06-18 16:46 Lars-Peter Clausen
2012-06-18 16:46 ` [PATCH 2/2] iio:trigger: " Lars-Peter Clausen
2012-06-21 14:19 ` [PATCH 1/2] staging:iio:trigger: " Jonathan Cameron
0 siblings, 2 replies; 5+ messages in thread
From: Lars-Peter Clausen @ 2012-06-18 16:46 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen
Use to_iio_trigger(dev) instead of dev_get_drvdata(dev). Both will return the
trigger which belongs to the device, but the the first on is a bit more
lightweight. Also this will eventually free up the drvdata pointer of the device
for driver specific data.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 4 ++--
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c | 4 ++--
drivers/staging/iio/trigger/iio-trig-sysfs.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
index f85734d..ce6a7b1 100644
--- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
+++ b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
@@ -60,7 +60,7 @@ struct bfin_tmr_state {
static ssize_t iio_bfin_tmr_frequency_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
- struct iio_trigger *trig = dev_get_drvdata(dev);
+ struct iio_trigger *trig = to_iio_trigger(dev);
struct bfin_tmr_state *st = trig->private_data;
long val;
int ret;
@@ -97,7 +97,7 @@ static ssize_t iio_bfin_tmr_frequency_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
- struct iio_trigger *trig = dev_get_drvdata(dev);
+ struct iio_trigger *trig = to_iio_trigger(dev);
struct bfin_tmr_state *st = trig->private_data;
return sprintf(buf, "%lu\n",
diff --git a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
index 9f2d055..4ceaa18 100644
--- a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
+++ b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
@@ -41,7 +41,7 @@ static ssize_t iio_trig_periodic_read_freq(struct device *dev,
struct device_attribute *attr,
char *buf)
{
- struct iio_trigger *trig = dev_get_drvdata(dev);
+ struct iio_trigger *trig = to_iio_trigger(dev);
struct iio_prtc_trigger_info *trig_info = trig->private_data;
return sprintf(buf, "%u\n", trig_info->frequency);
}
@@ -51,7 +51,7 @@ static ssize_t iio_trig_periodic_write_freq(struct device *dev,
const char *buf,
size_t len)
{
- struct iio_trigger *trig = dev_get_drvdata(dev);
+ struct iio_trigger *trig = to_iio_trigger(dev);
struct iio_prtc_trigger_info *trig_info = trig->private_data;
unsigned long val;
int ret;
diff --git a/drivers/staging/iio/trigger/iio-trig-sysfs.c b/drivers/staging/iio/trigger/iio-trig-sysfs.c
index 552763b..fee4746 100644
--- a/drivers/staging/iio/trigger/iio-trig-sysfs.c
+++ b/drivers/staging/iio/trigger/iio-trig-sysfs.c
@@ -92,7 +92,7 @@ static struct device iio_sysfs_trig_dev = {
static ssize_t iio_sysfs_trigger_poll(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
- struct iio_trigger *trig = dev_get_drvdata(dev);
+ struct iio_trigger *trig = to_iio_trigger(dev);
iio_trigger_poll_chained(trig, 0);
return count;
--
1.7.10
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] iio:trigger: Use to_iio_trigger() instead of dev_get_drvdata()
2012-06-18 16:46 [PATCH 1/2] staging:iio:trigger: Use to_iio_trigger() instead of dev_get_drvdata() Lars-Peter Clausen
@ 2012-06-18 16:46 ` Lars-Peter Clausen
2012-06-21 14:20 ` Jonathan Cameron
2012-06-21 14:19 ` [PATCH 1/2] staging:iio:trigger: " Jonathan Cameron
1 sibling, 1 reply; 5+ messages in thread
From: Lars-Peter Clausen @ 2012-06-18 16:46 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, Lars-Peter Clausen
Use to_iio_trigger(dev) instead of dev_get_drvdata(dev). Both will return the
trigger which belongs to the device, but the the first on is a bit more
lightweight.
Since this is the last location where we used dev_get_drvdata() for retrieving
the trigger there is no need anymore to assign the the trigger to the devices
drvdata, so we can remove that as well.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/iio/industrialio-trigger.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 0f582df..ec653fb 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -45,7 +45,7 @@ static ssize_t iio_trigger_read_name(struct device *dev,
struct device_attribute *attr,
char *buf)
{
- struct iio_trigger *trig = dev_get_drvdata(dev);
+ struct iio_trigger *trig = to_iio_trigger(dev);
return sprintf(buf, "%s\n", trig->name);
}
@@ -436,7 +436,6 @@ struct iio_trigger *iio_trigger_alloc(const char *fmt, ...)
trig->dev.type = &iio_trig_type;
trig->dev.bus = &iio_bus_type;
device_initialize(&trig->dev);
- dev_set_drvdata(&trig->dev, (void *)trig);
mutex_init(&trig->pool_lock);
trig->subirq_base
--
1.7.10
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] staging:iio:trigger: Use to_iio_trigger() instead of dev_get_drvdata()
2012-06-18 16:46 [PATCH 1/2] staging:iio:trigger: Use to_iio_trigger() instead of dev_get_drvdata() Lars-Peter Clausen
2012-06-18 16:46 ` [PATCH 2/2] iio:trigger: " Lars-Peter Clausen
@ 2012-06-21 14:19 ` Jonathan Cameron
1 sibling, 0 replies; 5+ messages in thread
From: Jonathan Cameron @ 2012-06-21 14:19 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: linux-iio
On 6/18/2012 5:46 PM, Lars-Peter Clausen wrote:
> Use to_iio_trigger(dev) instead of dev_get_drvdata(dev). Both will return the
> trigger which belongs to the device, but the the first on is a bit more
> lightweight. Also this will eventually free up the drvdata pointer of the device
> for driver specific data.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
> ---
> drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 4 ++--
> drivers/staging/iio/trigger/iio-trig-periodic-rtc.c | 4 ++--
> drivers/staging/iio/trigger/iio-trig-sysfs.c | 2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
> index f85734d..ce6a7b1 100644
> --- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
> +++ b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
> @@ -60,7 +60,7 @@ struct bfin_tmr_state {
> static ssize_t iio_bfin_tmr_frequency_store(struct device *dev,
> struct device_attribute *attr, const char *buf, size_t count)
> {
> - struct iio_trigger *trig = dev_get_drvdata(dev);
> + struct iio_trigger *trig = to_iio_trigger(dev);
> struct bfin_tmr_state *st = trig->private_data;
> long val;
> int ret;
> @@ -97,7 +97,7 @@ static ssize_t iio_bfin_tmr_frequency_show(struct device *dev,
> struct device_attribute *attr,
> char *buf)
> {
> - struct iio_trigger *trig = dev_get_drvdata(dev);
> + struct iio_trigger *trig = to_iio_trigger(dev);
> struct bfin_tmr_state *st = trig->private_data;
>
> return sprintf(buf, "%lu\n",
> diff --git a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
> index 9f2d055..4ceaa18 100644
> --- a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
> +++ b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
> @@ -41,7 +41,7 @@ static ssize_t iio_trig_periodic_read_freq(struct device *dev,
> struct device_attribute *attr,
> char *buf)
> {
> - struct iio_trigger *trig = dev_get_drvdata(dev);
> + struct iio_trigger *trig = to_iio_trigger(dev);
> struct iio_prtc_trigger_info *trig_info = trig->private_data;
> return sprintf(buf, "%u\n", trig_info->frequency);
> }
> @@ -51,7 +51,7 @@ static ssize_t iio_trig_periodic_write_freq(struct device *dev,
> const char *buf,
> size_t len)
> {
> - struct iio_trigger *trig = dev_get_drvdata(dev);
> + struct iio_trigger *trig = to_iio_trigger(dev);
> struct iio_prtc_trigger_info *trig_info = trig->private_data;
> unsigned long val;
> int ret;
> diff --git a/drivers/staging/iio/trigger/iio-trig-sysfs.c b/drivers/staging/iio/trigger/iio-trig-sysfs.c
> index 552763b..fee4746 100644
> --- a/drivers/staging/iio/trigger/iio-trig-sysfs.c
> +++ b/drivers/staging/iio/trigger/iio-trig-sysfs.c
> @@ -92,7 +92,7 @@ static struct device iio_sysfs_trig_dev = {
> static ssize_t iio_sysfs_trigger_poll(struct device *dev,
> struct device_attribute *attr, const char *buf, size_t count)
> {
> - struct iio_trigger *trig = dev_get_drvdata(dev);
> + struct iio_trigger *trig = to_iio_trigger(dev);
> iio_trigger_poll_chained(trig, 0);
>
> return count;
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] iio:trigger: Use to_iio_trigger() instead of dev_get_drvdata()
2012-06-18 16:46 ` [PATCH 2/2] iio:trigger: " Lars-Peter Clausen
@ 2012-06-21 14:20 ` Jonathan Cameron
0 siblings, 0 replies; 5+ messages in thread
From: Jonathan Cameron @ 2012-06-21 14:20 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: linux-iio
On 6/18/2012 5:46 PM, Lars-Peter Clausen wrote:
> Use to_iio_trigger(dev) instead of dev_get_drvdata(dev). Both will return the
> trigger which belongs to the device, but the the first on is a bit more
> lightweight.
>
> Since this is the last location where we used dev_get_drvdata() for retrieving
> the trigger there is no need anymore to assign the the trigger to the devices
> drvdata, so we can remove that as well.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
> ---
> drivers/iio/industrialio-trigger.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
> index 0f582df..ec653fb 100644
> --- a/drivers/iio/industrialio-trigger.c
> +++ b/drivers/iio/industrialio-trigger.c
> @@ -45,7 +45,7 @@ static ssize_t iio_trigger_read_name(struct device *dev,
> struct device_attribute *attr,
> char *buf)
> {
> - struct iio_trigger *trig = dev_get_drvdata(dev);
> + struct iio_trigger *trig = to_iio_trigger(dev);
> return sprintf(buf, "%s\n", trig->name);
> }
>
> @@ -436,7 +436,6 @@ struct iio_trigger *iio_trigger_alloc(const char *fmt, ...)
> trig->dev.type = &iio_trig_type;
> trig->dev.bus = &iio_bus_type;
> device_initialize(&trig->dev);
> - dev_set_drvdata(&trig->dev, (void *)trig);
>
> mutex_init(&trig->pool_lock);
> trig->subirq_base
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] staging:iio:trigger: Use to_iio_trigger() instead of dev_get_drvdata()
@ 2012-06-21 17:10 Lars-Peter Clausen
0 siblings, 0 replies; 5+ messages in thread
From: Lars-Peter Clausen @ 2012-06-21 17:10 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Jonathan Cameron, devel, linux-iio, Lars-Peter Clausen
Use to_iio_trigger(dev) instead of dev_get_drvdata(dev). Both will return the
trigger which belongs to the device, but the the first on is a bit more
lightweight. Also this will eventually free up the drvdata pointer of the device
for driver specific data.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 4 ++--
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c | 4 ++--
drivers/staging/iio/trigger/iio-trig-sysfs.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
index f85734d..ce6a7b1 100644
--- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
+++ b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
@@ -60,7 +60,7 @@ struct bfin_tmr_state {
static ssize_t iio_bfin_tmr_frequency_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
- struct iio_trigger *trig = dev_get_drvdata(dev);
+ struct iio_trigger *trig = to_iio_trigger(dev);
struct bfin_tmr_state *st = trig->private_data;
long val;
int ret;
@@ -97,7 +97,7 @@ static ssize_t iio_bfin_tmr_frequency_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
- struct iio_trigger *trig = dev_get_drvdata(dev);
+ struct iio_trigger *trig = to_iio_trigger(dev);
struct bfin_tmr_state *st = trig->private_data;
return sprintf(buf, "%lu\n",
diff --git a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
index 9f2d055..4ceaa18 100644
--- a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
+++ b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
@@ -41,7 +41,7 @@ static ssize_t iio_trig_periodic_read_freq(struct device *dev,
struct device_attribute *attr,
char *buf)
{
- struct iio_trigger *trig = dev_get_drvdata(dev);
+ struct iio_trigger *trig = to_iio_trigger(dev);
struct iio_prtc_trigger_info *trig_info = trig->private_data;
return sprintf(buf, "%u\n", trig_info->frequency);
}
@@ -51,7 +51,7 @@ static ssize_t iio_trig_periodic_write_freq(struct device *dev,
const char *buf,
size_t len)
{
- struct iio_trigger *trig = dev_get_drvdata(dev);
+ struct iio_trigger *trig = to_iio_trigger(dev);
struct iio_prtc_trigger_info *trig_info = trig->private_data;
unsigned long val;
int ret;
diff --git a/drivers/staging/iio/trigger/iio-trig-sysfs.c b/drivers/staging/iio/trigger/iio-trig-sysfs.c
index 552763b..fee4746 100644
--- a/drivers/staging/iio/trigger/iio-trig-sysfs.c
+++ b/drivers/staging/iio/trigger/iio-trig-sysfs.c
@@ -92,7 +92,7 @@ static struct device iio_sysfs_trig_dev = {
static ssize_t iio_sysfs_trigger_poll(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
- struct iio_trigger *trig = dev_get_drvdata(dev);
+ struct iio_trigger *trig = to_iio_trigger(dev);
iio_trigger_poll_chained(trig, 0);
return count;
--
1.7.10
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-06-21 17:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-18 16:46 [PATCH 1/2] staging:iio:trigger: Use to_iio_trigger() instead of dev_get_drvdata() Lars-Peter Clausen
2012-06-18 16:46 ` [PATCH 2/2] iio:trigger: " Lars-Peter Clausen
2012-06-21 14:20 ` Jonathan Cameron
2012-06-21 14:19 ` [PATCH 1/2] staging:iio:trigger: " Jonathan Cameron
-- strict thread matches above, loose matches on Subject: below --
2012-06-21 17:10 Lars-Peter Clausen
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).