imamnurby/smpl_train_seed8 huggingface dataset:
--- initial
+++ final
@@ -1,71 +1,71 @@
 static int vf610_nfc_probe(struct platform_device *pdev) {
   struct vf610_nfc *nfc;
   struct resource *res;
   struct mtd_info *mtd;
   struct nand_chip *chip;
   struct device_node *child;
   const struct of_device_id *of_id;
   int err;
   int irq;
   nfc = devm_kzalloc(&pdev->dev, sizeof(*nfc), GFP_KERNEL);
   if (!nfc) return -ENOMEM;
   nfc->dev = &pdev->dev;
   chip = &nfc->chip;
   mtd = nand_to_mtd(chip);
   mtd->owner = THIS_MODULE;
   mtd->dev.parent = nfc->dev;
   mtd->name = DRV_NAME;
   irq = platform_get_irq(pdev, 0);
   if (irq <= 0) return -EINVAL;
   res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
   nfc->regs = devm_ioremap_resource(nfc->dev, res);
   if (IS_ERR(nfc->regs)) return PTR_ERR(nfc->regs);
   nfc->clk = devm_clk_get(&pdev->dev, NULL);
   if (IS_ERR(nfc->clk)) return PTR_ERR(nfc->clk);
   err = clk_prepare_enable(nfc->clk);
   if (err) {
     dev_err(nfc->dev, "Unable to enable clock!\n");
     return err;
   }
   of_id = of_match_device(vf610_nfc_dt_ids, &pdev->dev);
   nfc->variant = (enum vf610_nfc_variant)of_id->data;
   for_each_available_child_of_node(nfc->dev->of_node, child) {
     if (of_device_is_compatible(child, "fsl,vf610-nfc-nandcs")) {
       if (nand_get_flash_node(chip)) {
         dev_err(nfc->dev, "Only one NAND chip supported!\n");
         err = -EINVAL;
         goto err_disable_clk;
       }
       nand_set_flash_node(chip, child);
     }
   }
   if (!nand_get_flash_node(chip)) {
     dev_err(nfc->dev, "NAND chip sub-node missing!\n");
     err = -ENODEV;
     goto err_disable_clk;
   }
   chip->exec_op = vf610_nfc_exec_op;
   chip->select_chip = vf610_nfc_select_chip;
   chip->options |= NAND_NO_SUBPAGE_WRITE;
   init_completion(&nfc->cmd_done);
   err = devm_request_irq(nfc->dev, irq, vf610_nfc_irq, 0, DRV_NAME, mtd);
   if (err) {
     dev_err(nfc->dev, "Error requesting IRQ!\n");
     goto err_disable_clk;
   }
   vf610_nfc_preinit_controller(nfc);
   /* Scan the NAND chip */
   chip->dummy_controller.ops = &vf610_nfc_controller_ops;
-  err = nand_scan(mtd, 1);
+  err = nand_scan(chip, 1);
   if (err) goto err_disable_clk;
   platform_set_drvdata(pdev, mtd);
   /* Register device in MTD */
   err = mtd_device_register(mtd, NULL, 0);
   if (err) goto err_cleanup_nand;
   return 0;
 err_cleanup_nand:
   nand_cleanup(chip);
 err_disable_clk:
   clk_disable_unprepare(nfc->clk);
   return err;
 }<sep>@@
expression board_mtd,this;
@@
board_mtd = nand_to_mtd(this)
...
-        nand_scan (board_mtd, 1)
+        nand_scan (this, 1)
--- initial
+++ final
@@ -1,41 +1,41 @@
 static int xway_nand_probe(struct platform_device *pdev) {
   struct xway_nand_data *data;
   struct mtd_info *mtd;
   struct resource *res;
   int err;
   u32 cs;
   u32 cs_flag = 0;
   /* Allocate memory for the device structure (and zero it) */
   data = devm_kzalloc(&pdev->dev, sizeof(struct xway_nand_data), GFP_KERNEL);
   if (!data) return -ENOMEM;
   res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
   data->nandaddr = devm_ioremap_resource(&pdev->dev, res);
   if (IS_ERR(data->nandaddr)) return PTR_ERR(data->nandaddr);
   nand_set_flash_node(&data->chip, pdev->dev.of_node);
   mtd = nand_to_mtd(&data->chip);
   mtd->dev.parent = &pdev->dev;
   data->chip.cmd_ctrl = xway_cmd_ctrl;
   data->chip.dev_ready = xway_dev_ready;
   data->chip.select_chip = xway_select_chip;
   data->chip.write_buf = xway_write_buf;
   data->chip.read_buf = xway_read_buf;
   data->chip.read_byte = xway_read_byte;
   data->chip.chip_delay = 30;
   data->chip.ecc.mode = NAND_ECC_SOFT;
   data->chip.ecc.algo = NAND_ECC_HAMMING;
   platform_set_drvdata(pdev, data);
   nand_set_controller_data(&data->chip, data);
   /* load our CS from the DT. Either we find a valid 1 or default to 0 */
   err = of_property_read_u32(pdev->dev.of_node, "lantiq,cs", &cs);
   if (!err && cs == 1) cs_flag = NAND_CON_IN_CS1 | NAND_CON_OUT_CS1;
   /* setup the EBU to run in NAND mode on our base addr */
   ltq_ebu_w32(CPHYSADDR(data->nandaddr) | ADDSEL1_MASK(3) | ADDSEL1_REGEN, EBU_ADDSEL1);
   ltq_ebu_w32(BUSCON1_SETUP | BUSCON1_BCGEN_RES | BUSCON1_WAITWRC2 | BUSCON1_WAITRDC2 | BUSCON1_HOLDC1 | BUSCON1_RECOVC1 | BUSCON1_CMULT4, LTQ_EBU_BUSCON1);
   ltq_ebu_w32(NAND_CON_NANDM | NAND_CON_CSMUX | NAND_CON_CS_P | NAND_CON_SE_P | NAND_CON_WP_P | NAND_CON_PRE_P | cs_flag, EBU_NAND_CON);
   /* Scan to find existence of the device */
-  err = nand_scan(mtd, 1);
+  err = nand_scan(&data->chip, 1);
   if (err) return err;
   err = mtd_device_register(mtd, NULL, 0);
   if (err) nand_release(mtd);
   return err;
 }<sep>@@
expression board_mtd,this;
@@
board_mtd = nand_to_mtd(this)
...
-        nand_scan (board_mtd, 1)
+        nand_scan (this, 1)
--- initial
+++ final
@@ -1,32 +1,32 @@
 struct omap_dss_device *omapdss_device_get_next(struct omap_dss_device *from, bool display_only) {
   struct omap_dss_device *dssdev;
   struct list_head *list;
   mutex_lock(&omapdss_devices_lock);
   if (list_empty(&omapdss_devices_list)) {
     dssdev = NULL;
     goto done;
   }
   /*
    * Start from the from entry if given or from omapdss_devices_list
    * otherwise.
    */
   list = from ? &from->list : &omapdss_devices_list;
   list_for_each_entry(dssdev, list, list) {
     /*
      * Stop if we reach the omapdss_devices_list, that's the end of
      * the list.
      */
     if (&dssdev->list == &omapdss_devices_list) {
       dssdev = NULL;
       goto done;
     }
     /* Filter out non-display entries if display_only is set. */
     if (!display_only || dssdev->driver) goto done;
   }
   dssdev = NULL;
 done:
-  if (from) omap_dss_put_device(from);
-  if (dssdev) omap_dss_get_device(dssdev);
+  if (from) omapdss_device_put(from);
+  if (dssdev) omapdss_device_get(dssdev);
   mutex_unlock(&omapdss_devices_lock);
   return dssdev;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)

@@
expression dssdev;
@@
-                       omap_dss_get_device
+                       omapdss_device_get
			(dssdev)
--- initial
+++ final
@@ -1,7 +1,7 @@
 struct omap_dss_device *omapdss_find_device_by_port(struct device_node *src, unsigned int port) {
   struct omap_dss_device *dssdev;
   list_for_each_entry(dssdev, &omapdss_devices_list, list) {
-    if (dssdev->dev->of_node == src && dssdev->port_num == port) return omap_dss_get_device(dssdev);
+    if (dssdev->dev->of_node == src && dssdev->port_num == port) return omapdss_device_get(dssdev);
   }
   return NULL;
 }<sep>@@
expression dssdev;
@@
-                       omap_dss_get_device
+                       omapdss_device_get
			(dssdev)
--- initial
+++ final
@@ -1,16 +1,16 @@
 static int tvc_connect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *src;
   int r;
   src = omapdss_of_find_source_for_first_ep(ddata->dev->of_node);
   if (IS_ERR(src)) {
     dev_err(ddata->dev, "failed to find video source\n");
     return PTR_ERR(src);
   }
   r = omapdss_device_connect(src, dssdev);
   if (r) {
-    omap_dss_put_device(src);
+    omapdss_device_put(src);
     return r;
   }
   return 0;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,5 +1,5 @@
 static void tvc_disconnect(struct omap_dss_device *dssdev) {
   struct omap_dss_device *src = dssdev->src;
   omapdss_device_disconnect(src, dssdev);
-  omap_dss_put_device(src);
+  omapdss_device_put(src);
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,15 +1,15 @@
 static int dvic_connect(struct omap_dss_device *dssdev) {
   struct omap_dss_device *src;
   int r;
   src = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(src)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(src);
   }
   r = omapdss_device_connect(src, dssdev);
   if (r) {
-    omap_dss_put_device(src);
+    omapdss_device_put(src);
     return r;
   }
   return 0;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,5 +1,5 @@
 static void dvic_disconnect(struct omap_dss_device *dssdev) {
   struct omap_dss_device *src = dssdev->src;
   omapdss_device_disconnect(src, dssdev);
-  omap_dss_put_device(src);
+  omapdss_device_put(src);
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,16 +1,16 @@
 static int hdmic_connect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *src;
   int r;
   src = omapdss_of_find_source_for_first_ep(ddata->dev->of_node);
   if (IS_ERR(src)) {
     dev_err(ddata->dev, "failed to find video source\n");
     return PTR_ERR(src);
   }
   r = omapdss_device_connect(src, dssdev);
   if (r) {
-    omap_dss_put_device(src);
+    omapdss_device_put(src);
     return r;
   }
   return 0;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,5 +1,5 @@
 static void hdmic_disconnect(struct omap_dss_device *dssdev) {
   struct omap_dss_device *src = dssdev->src;
   omapdss_device_disconnect(src, dssdev);
-  omap_dss_put_device(src);
+  omapdss_device_put(src);
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,15 +1,15 @@
 static int opa362_connect(struct omap_dss_device *dssdev, struct omap_dss_device *dst) {
   struct omap_dss_device *src;
   int r;
   src = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(src)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(src);
   }
   r = omapdss_device_connect(src, dssdev);
   if (r) {
-    omap_dss_put_device(src);
+    omapdss_device_put(src);
     return r;
   }
   return 0;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,6 +1,6 @@
 static void opa362_disconnect(struct omap_dss_device *dssdev, struct omap_dss_device *dst) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *src = dssdev->src;
   omapdss_device_disconnect(src, &ddata->dssdev);
-  omap_dss_put_device(src);
+  omapdss_device_put(src);
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,15 +1,15 @@
 static int tfp410_connect(struct omap_dss_device *dssdev, struct omap_dss_device *dst) {
   struct omap_dss_device *src;
   int r;
   src = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(src)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(src);
   }
   r = omapdss_device_connect(src, dssdev);
   if (r) {
-    omap_dss_put_device(src);
+    omapdss_device_put(src);
     return r;
   }
   return 0;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,6 +1,6 @@
 static void tfp410_disconnect(struct omap_dss_device *dssdev, struct omap_dss_device *dst) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *src = dssdev->src;
   omapdss_device_disconnect(src, &ddata->dssdev);
-  omap_dss_put_device(src);
+  omapdss_device_put(src);
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,20 +1,20 @@
 static int tpd_connect(struct omap_dss_device *dssdev, struct omap_dss_device *dst) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *src;
   int r;
   src = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(src)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(src);
   }
   r = omapdss_device_connect(src, dssdev);
   if (r) {
-    omap_dss_put_device(src);
+    omapdss_device_put(src);
     return r;
   }
   gpiod_set_value_cansleep(ddata->ct_cp_hpd_gpio, 1);
   gpiod_set_value_cansleep(ddata->ls_oe_gpio, 1);
   /* DC-DC converter needs at max 300us to get to 90% of 5V */
   udelay(300);
   return 0;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,8 +1,8 @@
 static void tpd_disconnect(struct omap_dss_device *dssdev, struct omap_dss_device *dst) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *src = dssdev->src;
   gpiod_set_value_cansleep(ddata->ct_cp_hpd_gpio, 0);
   gpiod_set_value_cansleep(ddata->ls_oe_gpio, 0);
   omapdss_device_disconnect(src, &ddata->dssdev);
-  omap_dss_put_device(src);
+  omapdss_device_put(src);
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,10 +1,10 @@
 static void omap_connector_destroy(struct drm_connector *connector) {
   struct omap_connector *omap_connector = to_omap_connector(connector);
   struct omap_dss_device *dssdev = omap_connector->dssdev;
   DBG("%s", omap_connector->dssdev->name);
   if (connector->polled == DRM_CONNECTOR_POLL_HPD && dssdev->driver->unregister_hpd_cb) { dssdev->driver->unregister_hpd_cb(dssdev); }
   drm_connector_unregister(connector);
   drm_connector_cleanup(connector);
   kfree(omap_connector);
-  omap_dss_put_device(dssdev);
+  omapdss_device_put(dssdev);
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,32 +1,32 @@
 struct drm_connector *omap_connector_init(struct drm_device *dev, int connector_type, struct omap_dss_device *dssdev, struct drm_encoder *encoder) {
   struct drm_connector *connector = NULL;
   struct omap_connector *omap_connector;
   bool hpd_supported = false;
   DBG("%s", dssdev->name);
-  omap_dss_get_device(dssdev);
+  omapdss_device_get(dssdev);
   omap_connector = kzalloc(sizeof(*omap_connector), GFP_KERNEL);
   if (!omap_connector) goto fail;
   omap_connector->dssdev = dssdev;
   connector = &omap_connector->base;
   drm_connector_init(dev, connector, &omap_connector_funcs, connector_type);
   drm_connector_helper_add(connector, &omap_connector_helper_funcs);
   if (dssdev->driver->register_hpd_cb) {
     int ret = dssdev->driver->register_hpd_cb(dssdev, omap_connector_hpd_cb, omap_connector);
     if (!ret)
       hpd_supported = true;
     else if (ret != -ENOTSUPP)
       DBG("%s: Failed to register HPD callback (%d).", dssdev->name, ret);
   }
   if (hpd_supported)
     connector->polled = DRM_CONNECTOR_POLL_HPD;
   else if (dssdev->driver->detect)
     connector->polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
   else
     connector->polled = 0;
   connector->interlace_allowed = 1;
   connector->doublescan_allowed = 0;
   return connector;
 fail:
   if (connector) omap_connector_destroy(connector);
   return NULL;
 }<sep>@@
expression dssdev;
@@
-                       omap_dss_get_device
+                       omapdss_device_get
			(dssdev)
--- initial
+++ final
@@ -1,42 +1,42 @@
 struct drm_crtc *omap_crtc_init(struct drm_device *dev, struct drm_plane *plane, struct omap_dss_device *dssdev) {
   struct omap_drm_private *priv = dev->dev_private;
   struct drm_crtc *crtc = NULL;
   struct omap_crtc *omap_crtc;
   enum omap_channel channel;
   struct omap_dss_device *out;
   int ret;
   out = omapdss_find_output_from_display(dssdev);
   channel = out->dispc_channel;
-  omap_dss_put_device(out);
+  omapdss_device_put(out);
   DBG("%s", channel_names[channel]);
   /* Multiple displays on same channel is not allowed */
   if (WARN_ON(omap_crtcs[channel] != NULL)) return ERR_PTR(-EINVAL);
   omap_crtc = kzalloc(sizeof(*omap_crtc), GFP_KERNEL);
   if (!omap_crtc) return ERR_PTR(-ENOMEM);
   crtc = &omap_crtc->base;
   init_waitqueue_head(&omap_crtc->pending_wait);
   omap_crtc->channel = channel;
   omap_crtc->name = channel_names[channel];
   ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL, &omap_crtc_funcs, NULL);
   if (ret < 0) {
     dev_err(dev->dev, "%s(): could not init crtc for: %s\n", __func__, dssdev->name);
     kfree(omap_crtc);
     return ERR_PTR(ret);
   }
   drm_crtc_helper_add(crtc, &omap_crtc_helper_funcs);
   /* The dispc API adapts to what ever size, but the HW supports
    * 256 element gamma table for LCDs and 1024 element table for
    * OMAP_DSS_CHANNEL_DIGIT. X server assumes 256 element gamma
    * tables so lets use that. Size of HW gamma table can be
    * extracted with dispc_mgr_gamma_size(). If it returns 0
    * gamma table is not supprted.
    */
   if (priv->dispc_ops->mgr_gamma_size(priv->dispc, channel)) {
     unsigned int gamma_lut_size = 256;
     drm_crtc_enable_color_mgmt(crtc, 0, false, gamma_lut_size);
     drm_mode_crtc_set_gamma_size(crtc, gamma_lut_size);
   }
   omap_plane_install_properties(crtc->primary, &crtc->base);
   omap_crtcs[channel] = omap_crtc;
   return crtc;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,33 +1,33 @@
 static int omap_connect_dssdevs(struct drm_device *ddev) {
   struct omap_drm_private *priv = ddev->dev_private;
   struct omap_dss_device *dssdev = NULL;
   int r;
   if (!omapdss_stack_is_ready()) return -EPROBE_DEFER;
   for_each_dss_display(dssdev) {
     r = omapdss_device_connect(dssdev, NULL);
     if (r == -EPROBE_DEFER) {
-      omap_dss_put_device(dssdev);
+      omapdss_device_put(dssdev);
       goto cleanup;
     } else if (r) {
       dev_warn(dssdev->dev, "could not connect display: %s\n", dssdev->name);
     } else {
-      omap_dss_get_device(dssdev);
+      omapdss_device_get(dssdev);
       priv->dssdevs[priv->num_dssdevs++] = dssdev;
       if (priv->num_dssdevs == ARRAY_SIZE(priv->dssdevs)) {
         /* To balance the 'for_each_dss_display' loop */
-        omap_dss_put_device(dssdev);
+        omapdss_device_put(dssdev);
         break;
       }
     }
   }
   /* Sort the list by DT aliases */
   sort(priv->dssdevs, priv->num_dssdevs, sizeof(priv->dssdevs[0]), omap_compare_dssdevs, NULL);
   return 0;
 cleanup:
   /*
    * if we are deferring probe, we disconnect the devices we previously
    * connected
    */
   omap_disconnect_dssdevs(ddev);
   return r;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)

@@
expression dssdev;
@@
-                       omap_dss_get_device
+                       omapdss_device_get
			(dssdev)
--- initial
+++ final
@@ -1,11 +1,11 @@
 static void omap_disconnect_dssdevs(struct drm_device *ddev) {
   struct omap_drm_private *priv = ddev->dev_private;
   unsigned int i;
   for (i = 0; i < priv->num_dssdevs; i++) {
     struct omap_dss_device *dssdev = priv->dssdevs[i];
     omapdss_device_disconnect(dssdev, NULL);
     priv->dssdevs[i] = NULL;
-    omap_dss_put_device(dssdev);
+    omapdss_device_put(dssdev);
   }
   priv->num_dssdevs = 0;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,6 +1,6 @@
 struct omap_dss_device *omapdss_find_output_from_display(struct omap_dss_device *dssdev) {
   while (dssdev->src)
     dssdev = dssdev->src;
-  if (dssdev->id != 0) return omap_dss_get_device(dssdev);
+  if (dssdev->id != 0) return omapdss_device_get(dssdev);
   return NULL;
 }<sep>@@
expression dssdev;
@@
-                       omap_dss_get_device
+                       omapdss_device_get
			(dssdev)
--- initial
+++ final
@@ -1,15 +1,15 @@
 static int panel_dpi_connect(struct omap_dss_device *dssdev) {
   struct omap_dss_device *src;
   int r;
   src = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(src)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(src);
   }
   r = omapdss_device_connect(src, dssdev);
   if (r) {
-    omap_dss_put_device(src);
+    omapdss_device_put(src);
     return r;
   }
   return 0;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,5 +1,5 @@
 static void panel_dpi_disconnect(struct omap_dss_device *dssdev) {
   struct omap_dss_device *src = dssdev->src;
   omapdss_device_disconnect(src, dssdev);
-  omap_dss_put_device(src);
+  omapdss_device_put(src);
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,34 +1,34 @@
 static int dsicm_connect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct device *dev = &ddata->pdev->dev;
   struct omap_dss_device *src;
   int r;
   src = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(src)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(src);
   }
   r = omapdss_device_connect(src, dssdev);
   if (r) {
     dev_err(dev, "Failed to connect to video source\n");
     goto err_connect;
   }
   r = src->ops->dsi.request_vc(src, &ddata->channel);
   if (r) {
     dev_err(dev, "failed to get virtual channel\n");
     goto err_req_vc;
   }
   r = src->ops->dsi.set_vc_id(src, ddata->channel, TCH);
   if (r) {
     dev_err(dev, "failed to set VC_ID\n");
     goto err_vc_id;
   }
   return 0;
 err_vc_id:
   src->ops->dsi.release_vc(src, ddata->channel);
 err_req_vc:
   omapdss_device_disconnect(src, dssdev);
 err_connect:
-  omap_dss_put_device(src);
+  omapdss_device_put(src);
   return r;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,7 +1,7 @@
 static void dsicm_disconnect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *src = dssdev->src;
   src->ops->dsi.release_vc(src, ddata->channel);
   omapdss_device_disconnect(src, dssdev);
-  omap_dss_put_device(src);
+  omapdss_device_put(src);
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,17 +1,17 @@
 static int lb035q02_connect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *src;
   int r;
   src = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(src)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(src);
   }
   r = omapdss_device_connect(src, dssdev);
   if (r) {
-    omap_dss_put_device(src);
+    omapdss_device_put(src);
     return r;
   }
   init_lb035q02_panel(ddata->spi);
   return 0;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,5 +1,5 @@
 static void lb035q02_disconnect(struct omap_dss_device *dssdev) {
   struct omap_dss_device *src = dssdev->src;
   omapdss_device_disconnect(src, dssdev);
-  omap_dss_put_device(src);
+  omapdss_device_put(src);
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,15 +1,15 @@
 static int nec_8048_connect(struct omap_dss_device *dssdev) {
   struct omap_dss_device *src;
   int r;
   src = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(src)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(src);
   }
   r = omapdss_device_connect(src, dssdev);
   if (r) {
-    omap_dss_put_device(src);
+    omapdss_device_put(src);
     return r;
   }
   return 0;
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)
--- initial
+++ final
@@ -1,5 +1,5 @@
 static void nec_8048_disconnect(struct omap_dss_device *dssdev) {
   struct omap_dss_device *src = dssdev->src;
   omapdss_device_disconnect(src, dssdev);
-  omap_dss_put_device(src);
+  omapdss_device_put(src);
 }<sep>@@
expression src;
@@
-       omap_dss_put_device
+       omapdss_device_put
	(src)