Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267541
b: refs/heads/master
c: 4024bc7
h: refs/heads/master
i:
  267539: 1a374b3
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent fe14d2c commit 0df72a2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e05e5f2336a94f127553c947dcfe2ce15f2c5f9a
refs/heads/master: 4024bc73b1d1d8f82518b67b0996cb7b870dd1d4
13 changes: 1 addition & 12 deletions trunk/drivers/staging/iio/iio.h
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ struct iio_info {
/**
* struct iio_dev - industrial I/O device
* @id: [INTERN] used to identify device internally
* @dev_data: [DRIVER] device specific data
* @modes: [DRIVER] operating modes supported by device
* @currentmode: [DRIVER] current operating mode
* @dev: [DRIVER] device structure, should be assigned a parent
Expand All @@ -296,7 +295,7 @@ struct iio_info {
**/
struct iio_dev {
int id;
void *dev_data;

int modes;
int currentmode;
struct device dev;
Expand Down Expand Up @@ -370,16 +369,6 @@ static inline struct iio_dev *to_iio_dev(struct device *d)
return container_of(d, struct iio_dev, dev);
};

/**
* iio_dev_get_devdata() - helper function gets device specific data
* @d: the iio_dev associated with the device
**/
static inline void *iio_dev_get_devdata(struct iio_dev *d)
{
return d->dev_data;
}


/* Can we make this smaller? */
#define IIO_ALIGN L1_CACHE_BYTES
/**
Expand Down

0 comments on commit 0df72a2

Please sign in to comment.