code.vuplus.com Git - vuplus_openvuplus_3.0/blob - meta-bsp/recipes-driver/hmp/hmp-usb-dvb-t2-c-v03arm/vu_keep_compatibility.patch

   1 diff -Naur media_build-bst-14.orig/linux/drivers/media/usb/dvb-usb-v2/dvbsky.c media_build-bst-14/linux/drivers/media/usb/dvb-usb-v2/dvbsky.c
   2 --- media_build-bst-14.orig/linux/drivers/media/usb/dvb-usb-v2/dvbsky.c 2014-10-14 10:05:32.000000000 +0200
   3 +++ media_build-bst-14/linux/drivers/media/usb/dvb-usb-v2/dvbsky.c      2015-05-30 11:26:08.138390315 +0200
   4 @@ -69,7 +69,7 @@
   5         if (wlen != 0)
   6                 memcpy(state->obuf, wbuf, wlen);
   7
   8 -       ret = dvb_usbv2_generic_rw_locked(d, state->obuf, wlen,
   9 +       ret = dvb_usbv2_mediatree_generic_rw_locked(d, state->obuf, wlen,
  10                         state->ibuf, rlen);
  11
  12         if (!ret && (rlen != 0))
  13 @@ -893,11 +893,11 @@
  14  static struct usb_driver dvbsky_usb_driver = {
  15         .name = KBUILD_MODNAME,
  16         .id_table = dvbsky_id_table,
  17 -       .probe = dvb_usbv2_probe,
  18 -       .disconnect = dvb_usbv2_disconnect,
  19 -       .suspend = dvb_usbv2_suspend,
  20 -       .resume = dvb_usbv2_resume,
  21 -       .reset_resume = dvb_usbv2_reset_resume,
  22 +       .probe = dvb_usbv2_mediatree_probe,
  23 +       .disconnect = dvb_usbv2_mediatree_disconnect,
  24 +       .suspend = dvb_usbv2_mediatree_suspend,
  25 +       .resume = dvb_usbv2_mediatree_resume,
  26 +       .reset_resume = dvb_usbv2_mediatree_reset_resume,
  27         .no_dynamic_id = 1,
  28         .soft_unbind = 1,
  29  };
  30 diff -Naur media_build-bst-14.orig/linux/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c media_build-bst-14/linux/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
  31 --- media_build-bst-14.orig/linux/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c   2014-10-14 08:52:04.000000000 +0200
  32 +++ media_build-bst-14/linux/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c        2015-05-30 11:50:42.125378459 +0200
  33 @@ -21,8 +21,8 @@
  34
  35  #include "dvb_usb_common.h"
  36
  37 -int dvb_usbv2_disable_rc_polling;
  38 -module_param_named(disable_rc_polling, dvb_usbv2_disable_rc_polling, int, 0644);
  39 +int dvb_usbv2_mediatree_disable_rc_polling;
  40 +module_param_named(disable_rc_polling, dvb_usbv2_mediatree_disable_rc_polling, int, 0644);
  41  MODULE_PARM_DESC(disable_rc_polling,
  42                 "disable remote control polling (default: 0)");
  43  static int dvb_usb_force_pid_filter_usage;
  44 @@ -31,7 +31,7 @@
  45  MODULE_PARM_DESC(force_pid_filter_usage,
  46                 "force all DVB USB devices to use a PID filter, if any (default: 0)");
  47
  48 -static int dvb_usbv2_download_firmware(struct dvb_usb_device *d,
  49 +static int dvb_usbv2_mediatree_download_firmware(struct dvb_usb_device *d,
  50                 const char *name)
  51  {
  52         int ret;
  53 @@ -65,7 +65,7 @@
  54         return ret;
  55  }
  56
  57 -static int dvb_usbv2_i2c_init(struct dvb_usb_device *d)
  58 +static int dvb_usbv2_mediatree_i2c_init(struct dvb_usb_device *d)
  59  {
  60         int ret;
  61         dev_dbg(&d->udev->dev, "%s:\n", __func__);
  62 @@ -92,7 +92,7 @@
  63         return ret;
  64  }
  65
  66 -static int dvb_usbv2_i2c_exit(struct dvb_usb_device *d)
  67 +static int dvb_usbv2_mediatree_i2c_exit(struct dvb_usb_device *d)
  68  {
  69         dev_dbg(&d->udev->dev, "%s:\n", __func__);
  70
  71 @@ -113,7 +113,7 @@
  72          * When the parameter has been set to 1 via sysfs while the
  73          * driver was running, or when bulk mode is enabled after IR init.
  74          */
  75 -       if (dvb_usbv2_disable_rc_polling || d->rc.bulk_mode) {
  76 +       if (dvb_usbv2_mediatree_disable_rc_polling || d->rc.bulk_mode) {
  77                 d->rc_polling_active = false;
  78                 return;
  79         }
  80 @@ -130,13 +130,13 @@
  81                         msecs_to_jiffies(d->rc.interval));
  82  }
  83
  84 -static int dvb_usbv2_remote_init(struct dvb_usb_device *d)
  85 +static int dvb_usbv2_mediatree_remote_init(struct dvb_usb_device *d)
  86  {
  87         int ret;
  88         struct rc_dev *dev;
  89         dev_dbg(&d->udev->dev, "%s:\n", __func__);
  90
  91 -       if (dvb_usbv2_disable_rc_polling || !d->props->get_rc_config)
  92 +       if (dvb_usbv2_mediatree_disable_rc_polling || !d->props->get_rc_config)
  93                 return 0;
  94
  95         d->rc.map_name = d->rc_map;
  96 @@ -199,7 +199,7 @@
  97         return ret;
  98  }
  99
 100 -static int dvb_usbv2_remote_exit(struct dvb_usb_device *d)
 101 +static int dvb_usbv2_mediatree_remote_exit(struct dvb_usb_device *d)
 102  {
 103         dev_dbg(&d->udev->dev, "%s:\n", __func__);
 104
 105 @@ -212,8 +212,8 @@
 106         return 0;
 107  }
 108  #else
 109 -       #define dvb_usbv2_remote_init(args...) 0
 110 -       #define dvb_usbv2_remote_exit(args...)
 111 +       #define dvb_usbv2_mediatree_remote_init(args...) 0
 112 +       #define dvb_usbv2_mediatree_remote_exit(args...)
 113  #endif
 114
 115  static void dvb_usb_data_complete(struct usb_data_stream *stream, u8 *buf,
 116 @@ -237,7 +237,7 @@
 117         dvb_dmx_swfilter_raw(&adap->demux, buf, len);
 118  }
 119
 120 -static int dvb_usbv2_adapter_stream_init(struct dvb_usb_adapter *adap)
 121 +static int dvb_usbv2_mediatree_adapter_stream_init(struct dvb_usb_adapter *adap)
 122  {
 123         dev_dbg(&adap_to_d(adap)->udev->dev, "%s: adap=%d\n", __func__,
 124                         adap->id);
 125 @@ -249,7 +249,7 @@
 126         return usb_urb_initv2(&adap->stream, &adap->props->stream);
 127  }
 128
 129 -static int dvb_usbv2_adapter_stream_exit(struct dvb_usb_adapter *adap)
 130 +static int dvb_usbv2_mediatree_adapter_stream_exit(struct dvb_usb_adapter *adap)
 131  {
 132         dev_dbg(&adap_to_d(adap)->udev->dev, "%s: adap=%d\n", __func__,
 133                         adap->id);
 134 @@ -419,7 +419,7 @@
 135         return ret;
 136  }
 137
 138 -static int dvb_usbv2_adapter_dvb_init(struct dvb_usb_adapter *adap)
 139 +static int dvb_usbv2_mediatree_adapter_dvb_init(struct dvb_usb_adapter *adap)
 140  {
 141         int ret;
 142         struct dvb_usb_device *d = adap_to_d(adap);
 143 @@ -489,7 +489,7 @@
 144         return ret;
 145  }
 146
 147 -static int dvb_usbv2_adapter_dvb_exit(struct dvb_usb_adapter *adap)
 148 +static int dvb_usbv2_mediatree_adapter_dvb_exit(struct dvb_usb_adapter *adap)
 149  {
 150         dev_dbg(&adap_to_d(adap)->udev->dev, "%s: adap=%d\n", __func__,
 151                         adap->id);
 152 @@ -505,7 +505,7 @@
 153         return 0;
 154  }
 155
 156 -static int dvb_usbv2_device_power_ctrl(struct dvb_usb_device *d, int onoff)
 157 +static int dvb_usbv2_mediatree_device_power_ctrl(struct dvb_usb_device *d, int onoff)
 158  {
 159         int ret;
 160
 161 @@ -543,7 +543,7 @@
 162                 set_bit(ADAP_INIT, &adap->state_bits);
 163         }
 164
 165 -       ret = dvb_usbv2_device_power_ctrl(d, 1);
 166 +       ret = dvb_usbv2_mediatree_device_power_ctrl(d, 1);
 167         if (ret < 0)
 168                 goto err;
 169
 170 @@ -603,7 +603,7 @@
 171                         goto err;
 172         }
 173
 174 -       ret = dvb_usbv2_device_power_ctrl(d, 0);
 175 +       ret = dvb_usbv2_mediatree_device_power_ctrl(d, 0);
 176         if (ret < 0)
 177                 goto err;
 178  err:
 179 @@ -622,7 +622,7 @@
 180         return ret;
 181  }
 182
 183 -static int dvb_usbv2_adapter_frontend_init(struct dvb_usb_adapter *adap)
 184 +static int dvb_usbv2_mediatree_adapter_frontend_init(struct dvb_usb_adapter *adap)
 185  {
 186         int ret, i, count_registered = 0;
 187         struct dvb_usb_device *d = adap_to_d(adap);
 188 @@ -693,7 +693,7 @@
 189         return ret;
 190  }
 191
 192 -static int dvb_usbv2_adapter_frontend_exit(struct dvb_usb_adapter *adap)
 193 +static int dvb_usbv2_mediatree_adapter_frontend_exit(struct dvb_usb_adapter *adap)
 194  {
 195         int i;
 196         dev_dbg(&adap_to_d(adap)->udev->dev, "%s: adap=%d\n", __func__,
 197 @@ -709,7 +709,7 @@
 198         return 0;
 199  }
 200
 201 -static int dvb_usbv2_adapter_init(struct dvb_usb_device *d)
 202 +static int dvb_usbv2_mediatree_adapter_init(struct dvb_usb_device *d)
 203  {
 204         struct dvb_usb_adapter *adap;
 205         int ret, i, adapter_count;
 206 @@ -763,15 +763,15 @@
 207                         adap->max_feed_count = adap->props->pid_filter_count;
 208                 }
 209
 210 -               ret = dvb_usbv2_adapter_stream_init(adap);
 211 +               ret = dvb_usbv2_mediatree_adapter_stream_init(adap);
 212                 if (ret)
 213                         goto err;
 214
 215 -               ret = dvb_usbv2_adapter_dvb_init(adap);
 216 +               ret = dvb_usbv2_mediatree_adapter_dvb_init(adap);
 217                 if (ret)
 218                         goto err;
 219
 220 -               ret = dvb_usbv2_adapter_frontend_init(adap);
 221 +               ret = dvb_usbv2_mediatree_adapter_frontend_init(adap);
 222                 if (ret)
 223                         goto err;
 224
 225 @@ -786,16 +786,16 @@
 226         return ret;
 227  }
 228
 229 -static int dvb_usbv2_adapter_exit(struct dvb_usb_device *d)
 230 +static int dvb_usbv2_mediatree_adapter_exit(struct dvb_usb_device *d)
 231  {
 232         int i;
 233         dev_dbg(&d->udev->dev, "%s:\n", __func__);
 234
 235         for (i = MAX_NO_OF_ADAPTER_PER_DEVICE - 1; i >= 0; i--) {
 236                 if (d->adapter[i].props) {
 237 -                       dvb_usbv2_adapter_frontend_exit(&d->adapter[i]);
 238 -                       dvb_usbv2_adapter_dvb_exit(&d->adapter[i]);
 239 -                       dvb_usbv2_adapter_stream_exit(&d->adapter[i]);
 240 +                       dvb_usbv2_mediatree_adapter_frontend_exit(&d->adapter[i]);
 241 +                       dvb_usbv2_mediatree_adapter_dvb_exit(&d->adapter[i]);
 242 +                       dvb_usbv2_mediatree_adapter_stream_exit(&d->adapter[i]);
 243                 }
 244         }
 245
 246 @@ -803,25 +803,25 @@
 247  }
 248
 249  /* general initialization functions */
 250 -static int dvb_usbv2_exit(struct dvb_usb_device *d)
 251 +static int dvb_usbv2_mediatree_exit(struct dvb_usb_device *d)
 252  {
 253         dev_dbg(&d->udev->dev, "%s:\n", __func__);
 254
 255 -       dvb_usbv2_remote_exit(d);
 256 -       dvb_usbv2_adapter_exit(d);
 257 -       dvb_usbv2_i2c_exit(d);
 258 +       dvb_usbv2_mediatree_remote_exit(d);
 259 +       dvb_usbv2_mediatree_adapter_exit(d);
 260 +       dvb_usbv2_mediatree_i2c_exit(d);
 261         kfree(d->priv);
 262         kfree(d);
 263
 264         return 0;
 265  }
 266
 267 -static int dvb_usbv2_init(struct dvb_usb_device *d)
 268 +static int dvb_usbv2_mediatree_init(struct dvb_usb_device *d)
 269  {
 270         int ret;
 271         dev_dbg(&d->udev->dev, "%s:\n", __func__);
 272
 273 -       dvb_usbv2_device_power_ctrl(d, 1);
 274 +       dvb_usbv2_mediatree_device_power_ctrl(d, 1);
 275
 276         if (d->props->read_config) {
 277                 ret = d->props->read_config(d);
 278 @@ -829,11 +829,11 @@
 279                         goto err;
 280         }
 281
 282 -       ret = dvb_usbv2_i2c_init(d);
 283 +       ret = dvb_usbv2_mediatree_i2c_init(d);
 284         if (ret < 0)
 285                 goto err;
 286
 287 -       ret = dvb_usbv2_adapter_init(d);
 288 +       ret = dvb_usbv2_mediatree_adapter_init(d);
 289         if (ret < 0)
 290                 goto err;
 291
 292 @@ -843,20 +843,20 @@
 293                         goto err;
 294         }
 295
 296 -       ret = dvb_usbv2_remote_init(d);
 297 +       ret = dvb_usbv2_mediatree_remote_init(d);
 298         if (ret < 0)
 299                 goto err;
 300
 301 -       dvb_usbv2_device_power_ctrl(d, 0);
 302 +       dvb_usbv2_mediatree_device_power_ctrl(d, 0);
 303
 304         return 0;
 305  err:
 306 -       dvb_usbv2_device_power_ctrl(d, 0);
 307 +       dvb_usbv2_mediatree_device_power_ctrl(d, 0);
 308         dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
 309         return ret;
 310  }
 311
 312 -int dvb_usbv2_probe(struct usb_interface *intf,
 313 +int dvb_usbv2_mediatree_probe(struct usb_interface *intf,
 314                 const struct usb_device_id *id)
 315  {
 316         int ret;
 317 @@ -918,7 +918,7 @@
 318                         if (!name)
 319                                 name = d->props->firmware;
 320
 321 -                       ret = dvb_usbv2_download_firmware(d, name);
 322 +                       ret = dvb_usbv2_mediatree_download_firmware(d, name);
 323                         if (ret == 0) {
 324                                 /* device is warm, continue initialization */
 325                                 ;
 326 @@ -943,7 +943,7 @@
 327         dev_info(&d->udev->dev, "%s: found a '%s' in warm state\n",
 328                         KBUILD_MODNAME, d->name);
 329
 330 -       ret = dvb_usbv2_init(d);
 331 +       ret = dvb_usbv2_mediatree_init(d);
 332         if (ret < 0)
 333                 goto err_free_all;
 334
 335 @@ -955,14 +955,14 @@
 336
 337         return 0;
 338  err_free_all:
 339 -       dvb_usbv2_exit(d);
 340 +       dvb_usbv2_mediatree_exit(d);
 341  err:
 342         dev_dbg(&udev->dev, "%s: failed=%d\n", __func__, ret);
 343         return ret;
 344  }
 345 -EXPORT_SYMBOL(dvb_usbv2_probe);
 346 +EXPORT_SYMBOL(dvb_usbv2_mediatree_probe);
 347
 348 -void dvb_usbv2_disconnect(struct usb_interface *intf)
 349 +void dvb_usbv2_mediatree_disconnect(struct usb_interface *intf)
 350  {
 351         struct dvb_usb_device *d = usb_get_intfdata(intf);
 352         const char *name = d->name;
 353 @@ -973,14 +973,14 @@
 354         if (d->props->exit)
 355                 d->props->exit(d);
 356
 357 -       dvb_usbv2_exit(d);
 358 +       dvb_usbv2_mediatree_exit(d);
 359
 360         dev_info(&dev, "%s: '%s' successfully deinitialized and disconnected\n",
 361                         KBUILD_MODNAME, name);
 362  }
 363 -EXPORT_SYMBOL(dvb_usbv2_disconnect);
 364 +EXPORT_SYMBOL(dvb_usbv2_mediatree_disconnect);
 365
 366 -int dvb_usbv2_suspend(struct usb_interface *intf, pm_message_t msg)
 367 +int dvb_usbv2_mediatree_suspend(struct usb_interface *intf, pm_message_t msg)
 368  {
 369         struct dvb_usb_device *d = usb_get_intfdata(intf);
 370         int ret = 0, i, active_fe;
 371 @@ -1009,9 +1009,9 @@
 372
 373         return ret;
 374  }
 375 -EXPORT_SYMBOL(dvb_usbv2_suspend);
 376 +EXPORT_SYMBOL(dvb_usbv2_mediatree_suspend);
 377
 378 -static int dvb_usbv2_resume_common(struct dvb_usb_device *d)
 379 +static int dvb_usbv2_mediatree_resume_common(struct dvb_usb_device *d)
 380  {
 381         int ret = 0, i, active_fe;
 382         struct dvb_frontend *fe;
 383 @@ -1042,33 +1042,33 @@
 384         return ret;
 385  }
 386
 387 -int dvb_usbv2_resume(struct usb_interface *intf)
 388 +int dvb_usbv2_mediatree_resume(struct usb_interface *intf)
 389  {
 390         struct dvb_usb_device *d = usb_get_intfdata(intf);
 391         dev_dbg(&d->udev->dev, "%s:\n", __func__);
 392
 393 -       return dvb_usbv2_resume_common(d);
 394 +       return dvb_usbv2_mediatree_resume_common(d);
 395  }
 396 -EXPORT_SYMBOL(dvb_usbv2_resume);
 397 +EXPORT_SYMBOL(dvb_usbv2_mediatree_resume);
 398
 399 -int dvb_usbv2_reset_resume(struct usb_interface *intf)
 400 +int dvb_usbv2_mediatree_reset_resume(struct usb_interface *intf)
 401  {
 402         struct dvb_usb_device *d = usb_get_intfdata(intf);
 403         int ret;
 404         dev_dbg(&d->udev->dev, "%s:\n", __func__);
 405
 406 -       dvb_usbv2_device_power_ctrl(d, 1);
 407 +       dvb_usbv2_mediatree_device_power_ctrl(d, 1);
 408
 409         if (d->props->init)
 410                 d->props->init(d);
 411
 412 -       ret = dvb_usbv2_resume_common(d);
 413 +       ret = dvb_usbv2_mediatree_resume_common(d);
 414
 415 -       dvb_usbv2_device_power_ctrl(d, 0);
 416 +       dvb_usbv2_mediatree_device_power_ctrl(d, 0);
 417
 418         return ret;
 419  }
 420 -EXPORT_SYMBOL(dvb_usbv2_reset_resume);
 421 +EXPORT_SYMBOL(dvb_usbv2_mediatree_reset_resume);
 422
 423  MODULE_VERSION("2.0");
 424  MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
 425 diff -Naur media_build-bst-14.orig/linux/drivers/media/usb/dvb-usb-v2/dvb_usb.h media_build-bst-14/linux/drivers/media/usb/dvb-usb-v2/dvb_usb.h
 426 --- media_build-bst-14.orig/linux/drivers/media/usb/dvb-usb-v2/dvb_usb.h        2014-03-11 11:08:46.000000000 +0100
 427 +++ media_build-bst-14/linux/drivers/media/usb/dvb-usb-v2/dvb_usb.h     2015-05-30 10:58:06.000000000 +0200
 428 @@ -388,19 +388,19 @@
 429         void *priv;
 430  };
 431
 432 -extern int dvb_usbv2_probe(struct usb_interface *,
 433 +extern int dvb_usbv2_mediatree_probe(struct usb_interface *,
 434                 const struct usb_device_id *);
 435 -extern void dvb_usbv2_disconnect(struct usb_interface *);
 436 -extern int dvb_usbv2_suspend(struct usb_interface *, pm_message_t);
 437 -extern int dvb_usbv2_resume(struct usb_interface *);
 438 -extern int dvb_usbv2_reset_resume(struct usb_interface *);
 439 +extern void dvb_usbv2_mediatree_disconnect(struct usb_interface *);
 440 +extern int dvb_usbv2_mediatree_suspend(struct usb_interface *, pm_message_t);
 441 +extern int dvb_usbv2_mediatree_resume(struct usb_interface *);
 442 +extern int dvb_usbv2_mediatree_reset_resume(struct usb_interface *);
 443
 444  /* the generic read/write method for device control */
 445 -extern int dvb_usbv2_generic_rw(struct dvb_usb_device *, u8 *, u16, u8 *, u16);
 446 -extern int dvb_usbv2_generic_write(struct dvb_usb_device *, u8 *, u16);
 447 +extern int dvb_usbv2_mediatree_generic_rw(struct dvb_usb_device *, u8 *, u16, u8 *, u16);
 448 +extern int dvb_usbv2_mediatree_generic_write(struct dvb_usb_device *, u8 *, u16);
 449  /* caller must hold lock when locked versions are called */
 450 -extern int dvb_usbv2_generic_rw_locked(struct dvb_usb_device *,
 451 +extern int dvb_usbv2_mediatree_generic_rw_locked(struct dvb_usb_device *,
 452                 u8 *, u16, u8 *, u16);
 453 -extern int dvb_usbv2_generic_write_locked(struct dvb_usb_device *, u8 *, u16);
 454 +extern int dvb_usbv2_mediatree_generic_write_locked(struct dvb_usb_device *, u8 *, u16);
 455
 456  #endif
 457 diff -Naur media_build-bst-14.orig/linux/drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c media_build-bst-14/linux/drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c
 458 --- media_build-bst-14.orig/linux/drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c    2014-03-11 11:08:46.000000000 +0100
 459 +++ media_build-bst-14/linux/drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c 2015-05-30 11:46:29.894460058 +0200
 460 @@ -21,7 +21,7 @@
 461
 462  #include "dvb_usb_common.h"
 463
 464 -static int dvb_usb_v2_generic_io(struct dvb_usb_device *d,
 465 +static int dvb_usb_v2_mediatree_generic_io(struct dvb_usb_device *d,
 466                 u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
 467  {
 468         int ret, actual_length;
 469 @@ -65,40 +65,40 @@
 470         return ret;
 471  }
 472
 473 -int dvb_usbv2_generic_rw(struct dvb_usb_device *d,
 474 +int dvb_usbv2_mediatree_generic_rw(struct dvb_usb_device *d,
 475                 u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
 476  {
 477         int ret;
 478
 479         mutex_lock(&d->usb_mutex);
 480 -       ret = dvb_usb_v2_generic_io(d, wbuf, wlen, rbuf, rlen);
 481 +       ret = dvb_usb_v2_mediatree_generic_io(d, wbuf, wlen, rbuf, rlen);
 482         mutex_unlock(&d->usb_mutex);
 483
 484         return ret;
 485  }
 486 -EXPORT_SYMBOL(dvb_usbv2_generic_rw);
 487 +EXPORT_SYMBOL(dvb_usbv2_mediatree_generic_rw);
 488
 489 -int dvb_usbv2_generic_write(struct dvb_usb_device *d, u8 *buf, u16 len)
 490 +int dvb_usbv2_mediatree_generic_write(struct dvb_usb_device *d, u8 *buf, u16 len)
 491  {
 492         int ret;
 493
 494         mutex_lock(&d->usb_mutex);
 495 -       ret = dvb_usb_v2_generic_io(d, buf, len, NULL, 0);
 496 +       ret = dvb_usb_v2_mediatree_generic_io(d, buf, len, NULL, 0);
 497         mutex_unlock(&d->usb_mutex);
 498
 499         return ret;
 500  }
 501 -EXPORT_SYMBOL(dvb_usbv2_generic_write);
 502 +EXPORT_SYMBOL(dvb_usbv2_mediatree_generic_write);
 503
 504 -int dvb_usbv2_generic_rw_locked(struct dvb_usb_device *d,
 505 +int dvb_usbv2_mediatree_generic_rw_locked(struct dvb_usb_device *d,
 506                 u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
 507  {
 508 -       return dvb_usb_v2_generic_io(d, wbuf, wlen, rbuf, rlen);
 509 +       return dvb_usb_v2_mediatree_generic_io(d, wbuf, wlen, rbuf, rlen);
 510  }
 511 -EXPORT_SYMBOL(dvb_usbv2_generic_rw_locked);
 512 +EXPORT_SYMBOL(dvb_usbv2_mediatree_generic_rw_locked);
 513
 514 -int dvb_usbv2_generic_write_locked(struct dvb_usb_device *d, u8 *buf, u16 len)
 515 +int dvb_usbv2_mediatree_generic_write_locked(struct dvb_usb_device *d, u8 *buf, u16 len)
 516  {
 517 -       return dvb_usb_v2_generic_io(d, buf, len, NULL, 0);
 518 +       return dvb_usb_v2_mediatree_generic_io(d, buf, len, NULL, 0);
 519  }
 520 -EXPORT_SYMBOL(dvb_usbv2_generic_write_locked);
 521 +EXPORT_SYMBOL(dvb_usbv2_mediatree_generic_write_locked);