From ecf2e02cd419fa4e50711b467931f652943735fd Mon Sep 17 00:00:00 2001 From: Amitoj Kaur Chawla Date: Sun, 21 Feb 2016 19:53:27 +0530 Subject: [PATCH] staging: rtl8712: Remove exceptional & on function name Remove exceptional '&' operator in front of a function name. The Coccinelle semantic patch that is used to make this change is as follows: // @r@ identifier f; @@ f(...) { ... } @@ identifier r.f; @@ - &f + f @m@ type T; identifier f; @@ T f(...); @@ identifier m.f; @@ - &f + f // Signed-off-by: Amitoj Kaur Chawla Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8712/usb_intf.c | 10 +++++----- drivers/staging/rtl8712/usb_ops.c | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c index f1d3d70..c1a0ca49 100644 --- a/drivers/staging/rtl8712/usb_intf.c +++ b/drivers/staging/rtl8712/usb_intf.c @@ -399,11 +399,11 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf, SET_NETDEV_DEV(pnetdev, &pusb_intf->dev); pnetdev->dev.type = &wlan_type; /* step 2. */ - padapter->dvobj_init = &r8712_usb_dvobj_init; - padapter->dvobj_deinit = &r8712_usb_dvobj_deinit; - padapter->halpriv.hal_bus_init = &r8712_usb_hal_bus_init; - padapter->dvobjpriv.inirp_init = &r8712_usb_inirp_init; - padapter->dvobjpriv.inirp_deinit = &r8712_usb_inirp_deinit; + padapter->dvobj_init = r8712_usb_dvobj_init; + padapter->dvobj_deinit = r8712_usb_dvobj_deinit; + padapter->halpriv.hal_bus_init = r8712_usb_hal_bus_init; + padapter->dvobjpriv.inirp_init = r8712_usb_inirp_init; + padapter->dvobjpriv.inirp_deinit = r8712_usb_inirp_deinit; /* step 3. * initialize the dvobj_priv */ diff --git a/drivers/staging/rtl8712/usb_ops.c b/drivers/staging/rtl8712/usb_ops.c index 856f257..9172400 100644 --- a/drivers/staging/rtl8712/usb_ops.c +++ b/drivers/staging/rtl8712/usb_ops.c @@ -179,22 +179,22 @@ static void usb_intf_hdl_close(u8 *priv) void r8712_usb_set_intf_funs(struct intf_hdl *pintf_hdl) { - pintf_hdl->intf_hdl_init = &usb_intf_hdl_init; - pintf_hdl->intf_hdl_unload = &usb_intf_hdl_unload; - pintf_hdl->intf_hdl_open = &usb_intf_hdl_open; - pintf_hdl->intf_hdl_close = &usb_intf_hdl_close; + pintf_hdl->intf_hdl_init = usb_intf_hdl_init; + pintf_hdl->intf_hdl_unload = usb_intf_hdl_unload; + pintf_hdl->intf_hdl_open = usb_intf_hdl_open; + pintf_hdl->intf_hdl_close = usb_intf_hdl_close; } void r8712_usb_set_intf_ops(struct _io_ops *pops) { memset((u8 *)pops, 0, sizeof(struct _io_ops)); - pops->_read8 = &usb_read8; - pops->_read16 = &usb_read16; - pops->_read32 = &usb_read32; - pops->_read_port = &r8712_usb_read_port; - pops->_write8 = &usb_write8; - pops->_write16 = &usb_write16; - pops->_write32 = &usb_write32; - pops->_write_mem = &r8712_usb_write_mem; - pops->_write_port = &r8712_usb_write_port; + pops->_read8 = usb_read8; + pops->_read16 = usb_read16; + pops->_read32 = usb_read32; + pops->_read_port = r8712_usb_read_port; + pops->_write8 = usb_write8; + pops->_write16 = usb_write16; + pops->_write32 = usb_write32; + pops->_write_mem = r8712_usb_write_mem; + pops->_write_port = r8712_usb_write_port; } -- 2.7.4