OSDN Git Service

usb: renesas_usbhs: Use struct assignment instead of memcpy()
authorYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Thu, 13 Jun 2019 11:18:48 +0000 (20:18 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 20 Jun 2019 12:23:24 +0000 (14:23 +0200)
To avoid the error-proneness of calls to sizeof() in the memcpy,
this patch uses struct assignment instead of memcpy.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>---
 This patch is based on Greg's linux-usb.git / usb-next branch.
 Note that mod_host.c also has memcpy but we cannot use struct assignment
 for it because the type of urb->setup_patcket is just "unsigned char *".

 drivers/usb/renesas_usbhs/common.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/renesas_usbhs/common.c

index a501ea6..ebbe322 100644 (file)
@@ -651,9 +651,8 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev)
                return NULL;
 
        dparam = &info->driver_param;
-       memcpy(dparam, &data->param, sizeof(data->param));
-       memcpy(&info->platform_callback, data->platform_callback,
-              sizeof(*data->platform_callback));
+       *dparam = data->param;
+       info->platform_callback = *data->platform_callback;
 
        if (!of_property_read_u32(dev->of_node, "renesas,buswait", &tmp))
                dparam->buswait_bwait = tmp;
@@ -714,17 +713,13 @@ static int usbhs_probe(struct platform_device *pdev)
         * care platform info
         */
 
-       memcpy(&priv->dparam,
-              &info->driver_param,
-              sizeof(struct renesas_usbhs_driver_param));
+       priv->dparam = info->driver_param;
 
        if (!info->platform_callback.get_id) {
                dev_err(&pdev->dev, "no platform callbacks");
                return -EINVAL;
        }
-       memcpy(&priv->pfunc,
-              &info->platform_callback,
-              sizeof(struct renesas_usbhs_platform_callback));
+       priv->pfunc = info->platform_callback;
 
        /* set driver callback functions for platform */
        dfunc                   = &info->driver_callback;