iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

can: gs_usb: uniformly use "parent" as variable name for struct gs_usb

Browse Source 
To ease readability and maintainability uniformly use the variable
name "parent" for the struct gs_usb in the gs_usb driver.

Link: https://lore.kernel.org/all/20230718-gs_usb-cleanups-v1-4-c3b9154ec605@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Marc Kleine-Budde 2023-07-06 16:16:33 +02:00
parent a2002f455c
commit b6980ad3a9
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/net/can/usb/gs_usb.c
View File

@ -524,7 +524,7 @@ static void gs_usb_set_timestamp(struct gs_can *dev, struct sk_buff *skb,
static void gs_usb_receive_bulk_callback(struct urb *urb)
{
struct gs_usb *usbcan = urb->context;
struct gs_usb *parent = urb->context;
struct gs_can *dev;
struct net_device *netdev;
int rc;
@ -535,7 +535,7 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)
struct canfd_frame *cfd;
struct sk_buff *skb;
BUG_ON(!usbcan);
BUG_ON(!parent);
switch (urb->status) {
case 0: /* success */
@ -552,7 +552,7 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)
if (hf->channel >= GS_MAX_INTF)
goto device_detach;
dev = usbcan->canch[hf->channel];
dev = parent->canch[hf->channel];
netdev = dev->netdev;
stats = &netdev->stats;
@ -644,10 +644,10 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)
}
resubmit_urb:
usb_fill_bulk_urb(urb, usbcan->udev,
usb_rcvbulkpipe(usbcan->udev, GS_USB_ENDPOINT_IN),
usb_fill_bulk_urb(urb, parent->udev,
usb_rcvbulkpipe(parent->udev, GS_USB_ENDPOINT_IN),
hf, dev->parent->hf_size_rx,
gs_usb_receive_bulk_callback, usbcan);
gs_usb_receive_bulk_callback, parent);
rc = usb_submit_urb(urb, GFP_ATOMIC);
@ -655,8 +655,8 @@ resubmit_urb:
if (rc == -ENODEV) {
device_detach:
for (rc = 0; rc < GS_MAX_INTF; rc++) {
if (usbcan->canch[rc])
netif_device_detach(usbcan->canch[rc]->netdev);
if (parent->canch[rc])
netif_device_detach(parent->canch[rc]->netdev);
}
}
}
@ -1369,7 +1369,7 @@ static int gs_usb_probe(struct usb_interface *intf,
{
struct usb_device *udev = interface_to_usbdev(intf);
struct gs_host_frame *hf;
struct gs_usb *dev;
struct gs_usb *parent;
struct gs_host_config hconf = {
.byte_order = cpu_to_le32(0x0000beef),
};
@ -1412,49 +1412,49 @@ static int gs_usb_probe(struct usb_interface *intf,
return -EINVAL;
}
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (!dev)
parent = kzalloc(sizeof(*parent), GFP_KERNEL);
if (!parent)
return -ENOMEM;
init_usb_anchor(&dev->rx_submitted);
init_usb_anchor(&parent->rx_submitted);
usb_set_intfdata(intf, dev);
dev->udev = udev;
usb_set_intfdata(intf, parent);
parent->udev = udev;
for (i = 0; i < icount; i++) {
unsigned int hf_size_rx = 0;
dev->canch[i] = gs_make_candev(i, intf, &dconf);
if (IS_ERR_OR_NULL(dev->canch[i])) {
parent->canch[i] = gs_make_candev(i, intf, &dconf);
if (IS_ERR_OR_NULL(parent->canch[i])) {
/* save error code to return later */
rc = PTR_ERR(dev->canch[i]);
rc = PTR_ERR(parent->canch[i]);
/* on failure destroy previously created candevs */
icount = i;
for (i = 0; i < icount; i++)
gs_destroy_candev(dev->canch[i]);
gs_destroy_candev(parent->canch[i]);
usb_kill_anchored_urbs(&dev->rx_submitted);
kfree(dev);
usb_kill_anchored_urbs(&parent->rx_submitted);
kfree(parent);
return rc;
}
dev->canch[i]->parent = dev;
parent->canch[i]->parent = parent;
/* set RX packet size based on FD and if hardware
* timestamps are supported.
*/
if (dev->canch[i]->can.ctrlmode_supported & CAN_CTRLMODE_FD) {
if (dev->canch[i]->feature & GS_CAN_FEATURE_HW_TIMESTAMP)
if (parent->canch[i]->can.ctrlmode_supported & CAN_CTRLMODE_FD) {
if (parent->canch[i]->feature & GS_CAN_FEATURE_HW_TIMESTAMP)
hf_size_rx = struct_size(hf, canfd_ts, 1);
else
hf_size_rx = struct_size(hf, canfd, 1);
} else {
if (dev->canch[i]->feature & GS_CAN_FEATURE_HW_TIMESTAMP)
if (parent->canch[i]->feature & GS_CAN_FEATURE_HW_TIMESTAMP)
hf_size_rx = struct_size(hf, classic_can_ts, 1);
else
hf_size_rx = struct_size(hf, classic_can, 1);
}
dev->hf_size_rx = max(dev->hf_size_rx, hf_size_rx);
parent->hf_size_rx = max(parent->hf_size_rx, hf_size_rx);
}
return 0;
@ -1462,22 +1462,22 @@ static int gs_usb_probe(struct usb_interface *intf,
static void gs_usb_disconnect(struct usb_interface *intf)
{
struct gs_usb *dev = usb_get_intfdata(intf);
struct gs_usb *parent = usb_get_intfdata(intf);
unsigned int i;
usb_set_intfdata(intf, NULL);
if (!dev) {
if (!parent) {
dev_err(&intf->dev, "Disconnect (nodata)\n");
return;
}
for (i = 0; i < GS_MAX_INTF; i++)
if (dev->canch[i])
gs_destroy_candev(dev->canch[i]);
if (parent->canch[i])
gs_destroy_candev(parent->canch[i]);
usb_kill_anchored_urbs(&dev->rx_submitted);
kfree(dev);
usb_kill_anchored_urbs(&parent->rx_submitted);
kfree(parent);
}
static const struct usb_device_id gs_usb_table[] = {