hc
2023-12-06 08f87f769b595151be1afeff53e144f543faa614
kernel/drivers/usb/atm/usbatm.c
....@@ -511,9 +511,10 @@
511511 ** receive **
512512 **************/
513513
514
-static void usbatm_rx_process(unsigned long data)
514
+static void usbatm_rx_process(struct tasklet_struct *t)
515515 {
516
- struct usbatm_data *instance = (struct usbatm_data *)data;
516
+ struct usbatm_data *instance = from_tasklet(instance, t,
517
+ rx_channel.tasklet);
517518 struct urb *urb;
518519
519520 while ((urb = usbatm_pop_urb(&instance->rx_channel))) {
....@@ -564,9 +565,10 @@
564565 ** send **
565566 ***********/
566567
567
-static void usbatm_tx_process(unsigned long data)
568
+static void usbatm_tx_process(struct tasklet_struct *t)
568569 {
569
- struct usbatm_data *instance = (struct usbatm_data *)data;
570
+ struct usbatm_data *instance = from_tasklet(instance, t,
571
+ tx_channel.tasklet);
570572 struct sk_buff *skb = instance->current_skb;
571573 struct urb *urb = NULL;
572574 const unsigned int buf_size = instance->tx_channel.buf_size;
....@@ -1069,8 +1071,8 @@
10691071
10701072 usbatm_init_channel(&instance->rx_channel);
10711073 usbatm_init_channel(&instance->tx_channel);
1072
- tasklet_init(&instance->rx_channel.tasklet, usbatm_rx_process, (unsigned long)instance);
1073
- tasklet_init(&instance->tx_channel.tasklet, usbatm_tx_process, (unsigned long)instance);
1074
+ tasklet_setup(&instance->rx_channel.tasklet, usbatm_rx_process);
1075
+ tasklet_setup(&instance->tx_channel.tasklet, usbatm_tx_process);
10741076 instance->rx_channel.stride = ATM_CELL_SIZE + driver->rx_padding;
10751077 instance->tx_channel.stride = ATM_CELL_SIZE + driver->tx_padding;
10761078 instance->rx_channel.usbatm = instance->tx_channel.usbatm = instance;
....@@ -1275,7 +1277,7 @@
12751277
12761278 static int __init usbatm_usb_init(void)
12771279 {
1278
- if (sizeof(struct usbatm_control) > FIELD_SIZEOF(struct sk_buff, cb)) {
1280
+ if (sizeof(struct usbatm_control) > sizeof_field(struct sk_buff, cb)) {
12791281 printk(KERN_ERR "%s unusable with this kernel!\n", usbatm_driver_name);
12801282 return -EIO;
12811283 }