Changeset ff381a7 in mainline for uspace/drv/block

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/drv/block

Files:

• ahci/ahci.c (modified) (1 diff)
• ata_bd/main.c (modified) (1 diff)
• ddisk/ddisk.c (modified) (1 diff)

uspace/drv/block/ahci/ahci.c

@@ -1140 +1140 @@
         
         /* Connect to parent device */
-        ahci->parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
+        ahci->parent_sess = ddf_dev_parent_sess_create(dev);
         if (ahci->parent_sess == NULL)
                 return NULL;

uspace/drv/block/ata_bd/main.c

@@ -68 +68 @@
         int rc;
 
-        parent_sess = ddf_dev_parent_sess_create(dev,
-            EXCHANGE_SERIALIZE);
+        parent_sess = ddf_dev_parent_sess_create(dev);
         if (parent_sess == NULL)
                 return ENOMEM;

uspace/drv/block/ddisk/ddisk.c

@@ -286 +286 @@
         int rc;
 
-        parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
+        parent_sess = ddf_dev_parent_sess_create(dev);
         if (parent_sess == NULL)
                 return ENOMEM;