This simply reorders functions in virtio_config
so width access wrapper helpers are all together.
Drops an extra empty line while we are at it.
Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
---
include/linux/virtio_config.h | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index ed1e0d5..1e306f7 100644
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -298,13 +298,6 @@ static inline __virtio64 cpu_to_virtio64(struct
virtio_device *vdev, u64 val)
} \
} while(0)
-static inline u8 virtio_cread8(struct virtio_device *vdev, unsigned int offset)
-{
- u8 ret;
- vdev->config->get(vdev, offset, &ret, sizeof(ret));
- return ret;
-}
-
/* Read @count fields, @bytes each. */
static inline void __virtio_cread_many(struct virtio_device *vdev,
unsigned int offset,
@@ -326,7 +319,6 @@ static inline void __virtio_cread_many(struct virtio_device
*vdev,
} while (gen != old);
}
-
static inline void virtio_cread_bytes(struct virtio_device *vdev,
unsigned int offset,
void *buf, size_t len)
@@ -334,6 +326,13 @@ static inline void virtio_cread_bytes(struct virtio_device
*vdev,
__virtio_cread_many(vdev, offset, buf, len, 1);
}
+static inline u8 virtio_cread8(struct virtio_device *vdev, unsigned int offset)
+{
+ u8 ret;
+ vdev->config->get(vdev, offset, &ret, sizeof(ret));
+ return ret;
+}
+
static inline void virtio_cwrite8(struct virtio_device *vdev,
unsigned int offset, u8 val)
{
--
MST
On Tue, Mar 31, 2015 at 05:17:25PM +0200, Michael S. Tsirkin wrote:> This simply reorders functions in virtio_config > so width access wrapper helpers are all together. > Drops an extra empty line while we are at it. > > Signed-off-by: Michael S. Tsirkin <mst at redhat.com>Ping> --- > include/linux/virtio_config.h | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h > index ed1e0d5..1e306f7 100644 > --- a/include/linux/virtio_config.h > +++ b/include/linux/virtio_config.h > @@ -298,13 +298,6 @@ static inline __virtio64 cpu_to_virtio64(struct virtio_device *vdev, u64 val) > } \ > } while(0) > > -static inline u8 virtio_cread8(struct virtio_device *vdev, unsigned int offset) > -{ > - u8 ret; > - vdev->config->get(vdev, offset, &ret, sizeof(ret)); > - return ret; > -} > - > /* Read @count fields, @bytes each. */ > static inline void __virtio_cread_many(struct virtio_device *vdev, > unsigned int offset, > @@ -326,7 +319,6 @@ static inline void __virtio_cread_many(struct virtio_device *vdev, > } while (gen != old); > } > > - > static inline void virtio_cread_bytes(struct virtio_device *vdev, > unsigned int offset, > void *buf, size_t len) > @@ -334,6 +326,13 @@ static inline void virtio_cread_bytes(struct virtio_device *vdev, > __virtio_cread_many(vdev, offset, buf, len, 1); > } > > +static inline u8 virtio_cread8(struct virtio_device *vdev, unsigned int offset) > +{ > + u8 ret; > + vdev->config->get(vdev, offset, &ret, sizeof(ret)); > + return ret; > +} > + > static inline void virtio_cwrite8(struct virtio_device *vdev, > unsigned int offset, u8 val) > { > -- > MST
On Wed, 8 Apr 2015 16:49:46 +0200 "Michael S. Tsirkin" <mst at redhat.com> wrote:> On Tue, Mar 31, 2015 at 05:17:25PM +0200, Michael S. Tsirkin wrote: > > This simply reorders functions in virtio_config > > so width access wrapper helpers are all together. > > Drops an extra empty line while we are at it. > > > > Signed-off-by: Michael S. Tsirkin <mst at redhat.com> > > Ping > > > --- > > include/linux/virtio_config.h | 15 +++++++-------- > > 1 file changed, 7 insertions(+), 8 deletions(-) > >Acked-by: Cornelia Huck <cornelia.huck at de.ibm.com>