[Xen-devel] [PATCH] xen-platform: use builtin_pci_driver

[Geliang Tang]

Use builtin_pci_driver() helper to simplify the code.

Signed-off-by: Geliang Tang 
---
 drivers/xen/platform-pci.c | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
index b59c9455..112ce42 100644
--- a/drivers/xen/platform-pci.c
+++ b/drivers/xen/platform-pci.c
@@ -125,8 +125,4 @@ static struct pci_driver platform_driver = {
.id_table =   platform_pci_tbl,
 };
 
-static int __init platform_pci_init(void)
-{
-   return pci_register_driver(&platform_driver);
-}
-device_initcall(platform_pci_init);
+builtin_pci_driver(platform_driver);
-- 
2.9.3


___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[Xen-devel] [PATCH] xen/blkback: use rb_entry()

[Geliang Tang]

To make the code clearer, use rb_entry() instead of container_of() to
deal with rbtree.

Signed-off-by: Geliang Tang 
---
 drivers/block/xen-blkback/blkback.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/block/xen-blkback/blkback.c 
b/drivers/block/xen-blkback/blkback.c
index 726c32e..7e59fae 100644
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -191,10 +191,10 @@ static void make_response(struct xen_blkif_ring *ring, 
u64 id,
  unsigned short op, int st);
 
 #define foreach_grant_safe(pos, n, rbtree, node) \
-   for ((pos) = container_of(rb_first((rbtree)), typeof(*(pos)), node), \
+   for ((pos) = rb_entry(rb_first((rbtree)), typeof(*(pos)), node), \
 (n) = (&(pos)->node != NULL) ? rb_next(&(pos)->node) : NULL; \
 &(pos)->node != NULL; \
-(pos) = container_of(n, typeof(*(pos)), node), \
+(pos) = rb_entry(n, typeof(*(pos)), node), \
 (n) = (&(pos)->node != NULL) ? rb_next(&(pos)->node) : NULL)
 
 
@@ -223,7 +223,7 @@ static int add_persistent_gnt(struct xen_blkif_ring *ring,
/* Figure out where to put new node */
new = &ring->persistent_gnts.rb_node;
while (*new) {
-   this = container_of(*new, struct persistent_gnt, node);
+   this = rb_entry(*new, struct persistent_gnt, node);
 
parent = *new;
if (persistent_gnt->gnt < this->gnt)
@@ -254,7 +254,7 @@ static struct persistent_gnt *get_persistent_gnt(struct 
xen_blkif_ring *ring,
 
node = ring->persistent_gnts.rb_node;
while (node) {
-   data = container_of(node, struct persistent_gnt, node);
+   data = rb_entry(node, struct persistent_gnt, node);
 
if (gref < data->gnt)
node = node->rb_left;
-- 
2.9.3


___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[Xen-devel] [PATCH] xen/evtchn: use rb_entry()

[Geliang Tang]

To make the code clearer, use rb_entry() instead of container_of() to
deal with rbtree.

Signed-off-by: Geliang Tang 
---
 drivers/xen/evtchn.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
index e8c7f09..6890897 100644
--- a/drivers/xen/evtchn.c
+++ b/drivers/xen/evtchn.c
@@ -125,7 +125,7 @@ static int add_evtchn(struct per_user_data *u, struct 
user_evtchn *evtchn)
while (*new) {
struct user_evtchn *this;
 
-   this = container_of(*new, struct user_evtchn, node);
+   this = rb_entry(*new, struct user_evtchn, node);
 
parent = *new;
if (this->port < evtchn->port)
@@ -157,7 +157,7 @@ static struct user_evtchn *find_evtchn(struct per_user_data 
*u, unsigned port)
while (node) {
struct user_evtchn *evtchn;
 
-   evtchn = container_of(node, struct user_evtchn, node);
+   evtchn = rb_entry(node, struct user_evtchn, node);
 
if (evtchn->port < port)
node = node->rb_left;
-- 
2.9.3


___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[Xen-devel] [PATCH] xen/scsifront: use offset_in_page() macro

[Geliang Tang]

Use offset_in_page() macro instead of open-coding.

Signed-off-by: Geliang Tang 
---
 drivers/scsi/xen-scsifront.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c
index 9aa1fe1..a6a8b60 100644
--- a/drivers/scsi/xen-scsifront.c
+++ b/drivers/scsi/xen-scsifront.c
@@ -434,7 +434,7 @@ static int map_data_for_request(struct vscsifrnt_info *info,
 
if (seg_grants) {
page = virt_to_page(seg);
-   off = (unsigned long)seg & ~PAGE_MASK;
+   off = offset_in_page(seg);
len = sizeof(struct scsiif_request_segment) * data_grants;
while (len > 0) {
bytes = min_t(unsigned int, len, PAGE_SIZE - off);
-- 
2.9.3


___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel