usb: dwc3: Fix a compilation error with the edison defconfig

[oweals/u-boot.git] / lib / efi_driver / efi_block_device.c

diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c
index d9d2b14f61244dcf8575e833b1e0c7318e256fde..3f147cf6087948db2951e40ee8c9592ef5aa10f4 100644 (file)
--- a/lib/efi_driver/efi_block_device.c
+++ b/lib/efi_driver/efi_block_device.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  EFI block driver
  *
  *  Copyright (c) 2017 Heinrich Schuchardt
  *
- *  SPDX-License-Identifier:     GPL-2.0+
- *
  * The EFI uclass creates a handle for this driver and installs the
  * driver binding protocol on it.
  *
@@ -39,7 +38,7 @@
  * handle      handle of the controller on which this driver is installed
  * io          block io protocol proxied by this driver
  */
-struct efi_blk_priv {
+struct efi_blk_platdata {
        efi_handle_t            handle;
        struct efi_block_io     *io;
 };
@@ -56,8 +55,8 @@ struct efi_blk_priv {
 static ulong efi_bl_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
                         void *buffer)
 {
-       struct efi_blk_priv *priv = dev->priv;
-       struct efi_block_io *io = priv->io;
+       struct efi_blk_platdata *platdata = dev_get_platdata(dev);
+       struct efi_block_io *io = platdata->io;
        efi_status_t ret;
 
        EFI_PRINT("%s: read '%s', from block " LBAFU ", " LBAFU " blocks\n",
@@ -85,8 +84,8 @@ static ulong efi_bl_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
 static ulong efi_bl_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
                          const void *buffer)
 {
-       struct efi_blk_priv *priv = dev->priv;
-       struct efi_block_io *io = priv->io;
+       struct efi_blk_platdata *platdata = dev_get_platdata(dev);
+       struct efi_block_io *io = platdata->io;
        efi_status_t ret;
 
        EFI_PRINT("%s: write '%s', from block " LBAFU ", " LBAFU " blocks\n",
@@ -136,7 +135,7 @@ static int efi_bl_bind(efi_handle_t handle, void *interface)
        struct efi_object *obj = efi_search_obj(handle);
        struct efi_block_io *io = interface;
        int disks;
-       struct efi_blk_priv *priv;
+       struct efi_blk_platdata *platdata;
 
        EFI_PRINT("%s: handle %p, interface %p\n", __func__, handle, io);
 
@@ -162,18 +161,18 @@ static int efi_bl_bind(efi_handle_t handle, void *interface)
                return ret;
        if (!bdev)
                return -ENOENT;
-       /* Allocate priv */
+       /* Set the DM_FLAG_NAME_ALLOCED flag to avoid a memory leak */
+       device_set_name_alloced(bdev);
+
+       platdata = dev_get_platdata(bdev);
+       platdata->handle = handle;
+       platdata->io = interface;
+
        ret = device_probe(bdev);
        if (ret)
                return ret;
        EFI_PRINT("%s: block device '%s' created\n", __func__, bdev->name);
 
-       priv = bdev->priv;
-       priv->handle = handle;
-       priv->io = interface;
-
-       ret = blk_prepare_device(bdev);
-
        /* Create handles for the partions of the block device */
        disks = efi_bl_bind_partitions(handle, bdev);
        EFI_PRINT("Found %d partitions\n", disks);
@@ -192,7 +191,7 @@ U_BOOT_DRIVER(efi_blk) = {
        .name                   = "efi_blk",
        .id                     = UCLASS_BLK,
        .ops                    = &efi_blk_ops,
-       .priv_auto_alloc_size   = sizeof(struct efi_blk_priv),
+       .platdata_auto_alloc_size = sizeof(struct efi_blk_platdata),
 };
 
 /* EFI driver operators */