shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit b6980ad3a9 ]

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>
Stable-dep-of: 889b2ae9139a ("can: gs_usb: add usb endpoint address detection at driver probe step")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Marc Kleine-Budde
2023-07-06 16:16:33 +02:00
committed by Greg Kroah-Hartman
parent a04d8f5834
commit 92cd695dd5
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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