imamnurby/smpl_train_seed8 huggingface dataset:
--- initial
+++ final
@@ -1,62 +1,62 @@
 static int tegra_ahci_probe(struct platform_device *pdev) {
   struct ahci_host_priv *hpriv;
   struct tegra_ahci_priv *tegra;
   struct resource *res;
   int ret;
   unsigned int i;
-  hpriv = ahci_platform_get_resources(pdev);
+  hpriv = ahci_platform_get_resources(pdev, 0);
   if (IS_ERR(hpriv)) return PTR_ERR(hpriv);
   tegra = devm_kzalloc(&pdev->dev, sizeof(*tegra), GFP_KERNEL);
   if (!tegra) return -ENOMEM;
   hpriv->plat_data = tegra;
   tegra->pdev = pdev;
   tegra->soc = of_device_get_match_data(&pdev->dev);
   res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
   tegra->sata_regs = devm_ioremap_resource(&pdev->dev, res);
   if (IS_ERR(tegra->sata_regs)) return PTR_ERR(tegra->sata_regs);
   /*
    * AUX registers is optional.
    */
   res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
   if (res) {
     tegra->sata_aux_regs = devm_ioremap_resource(&pdev->dev, res);
     if (IS_ERR(tegra->sata_aux_regs)) return PTR_ERR(tegra->sata_aux_regs);
   }
   tegra->sata_rst = devm_reset_control_get(&pdev->dev, "sata");
   if (IS_ERR(tegra->sata_rst)) {
     dev_err(&pdev->dev, "Failed to get sata reset\n");
     return PTR_ERR(tegra->sata_rst);
   }
   tegra->sata_oob_rst = devm_reset_control_get(&pdev->dev, "sata-oob");
   if (IS_ERR(tegra->sata_oob_rst)) {
     dev_err(&pdev->dev, "Failed to get sata-oob reset\n");
     return PTR_ERR(tegra->sata_oob_rst);
   }
   tegra->sata_cold_rst = devm_reset_control_get(&pdev->dev, "sata-cold");
   if (IS_ERR(tegra->sata_cold_rst)) {
     dev_err(&pdev->dev, "Failed to get sata-cold reset\n");
     return PTR_ERR(tegra->sata_cold_rst);
   }
   tegra->sata_clk = devm_clk_get(&pdev->dev, "sata");
   if (IS_ERR(tegra->sata_clk)) {
     dev_err(&pdev->dev, "Failed to get sata clock\n");
     return PTR_ERR(tegra->sata_clk);
   }
   tegra->supplies = devm_kcalloc(&pdev->dev, tegra->soc->num_supplies, sizeof(*tegra->supplies), GFP_KERNEL);
   if (!tegra->supplies) return -ENOMEM;
   for (i = 0; i < tegra->soc->num_supplies; i++)
     tegra->supplies[i].supply = tegra->soc->supply_names[i];
   ret = devm_regulator_bulk_get(&pdev->dev, tegra->soc->num_supplies, tegra->supplies);
   if (ret) {
     dev_err(&pdev->dev, "Failed to get regulators\n");
     return ret;
   }
   ret = tegra_ahci_controller_init(hpriv);
   if (ret) return ret;
   ret = ahci_platform_init_host(pdev, hpriv, &ahci_tegra_port_info, &ahci_platform_sht);
   if (ret) goto deinit_controller;
   return 0;
 deinit_controller:
   tegra_ahci_controller_deinit(hpriv);
   return ret;
 }<sep>@@
expression pdev;
@@
ahci_platform_get_resources(pdev
+  , 0
   )
--- initial
+++ final
@@ -1,9 +1,9 @@
 static int bnxt_setup_tc_block(struct net_device *dev, struct tc_block_offload *f) {
   struct bnxt *bp = netdev_priv(dev);
   if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, bnxt_setup_tc_block_cb, bp, bp);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, bnxt_setup_tc_block_cb, bp, bp, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, bnxt_setup_tc_block_cb, bp); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,9 +1,9 @@
 static int bnxt_vf_rep_setup_tc_block(struct net_device *dev, struct tc_block_offload *f) {
   struct bnxt_vf_rep *vf_rep = netdev_priv(dev);
   if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, bnxt_vf_rep_setup_tc_block_cb, vf_rep, vf_rep);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, bnxt_vf_rep_setup_tc_block_cb, vf_rep, vf_rep, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, bnxt_vf_rep_setup_tc_block_cb, vf_rep); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,9 +1,9 @@
 static int cxgb_setup_tc_block(struct net_device *dev, struct tc_block_offload *f) {
   struct port_info *pi = netdev2pinfo(dev);
   if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, cxgb_setup_tc_block_cb, pi, dev);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, cxgb_setup_tc_block_cb, pi, dev, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, cxgb_setup_tc_block_cb, pi); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,9 +1,9 @@
 static int mlx5e_setup_tc_block(struct net_device *dev, struct tc_block_offload *f) {
   struct mlx5e_priv *priv = netdev_priv(dev);
   if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, mlx5e_setup_tc_block_cb, priv, priv);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, mlx5e_setup_tc_block_cb, priv, priv, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, mlx5e_setup_tc_block_cb, priv); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,9 +1,9 @@
 static int mlx5e_rep_setup_tc_block(struct net_device *dev, struct tc_block_offload *f) {
   struct mlx5e_priv *priv = netdev_priv(dev);
   if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, mlx5e_rep_setup_tc_cb, priv, priv);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, mlx5e_rep_setup_tc_cb, priv, priv, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, mlx5e_rep_setup_tc_cb, priv); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,9 +1,9 @@
 static int i40e_setup_tc_block(struct net_device *dev, struct tc_block_offload *f) {
   struct i40e_netdev_priv *np = netdev_priv(dev);
   if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, i40e_setup_tc_block_cb, np, np);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, i40e_setup_tc_block_cb, np, np, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, i40e_setup_tc_block_cb, np); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,9 +1,9 @@
 static int i40evf_setup_tc_block(struct net_device *dev, struct tc_block_offload *f) {
   struct i40evf_adapter *adapter = netdev_priv(dev);
   if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, i40evf_setup_tc_block_cb, adapter, adapter);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, i40evf_setup_tc_block_cb, adapter, adapter, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, i40evf_setup_tc_block_cb, adapter); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,8 +1,8 @@
 static int igb_setup_tc_block(struct igb_adapter *adapter, struct tc_block_offload *f) {
   if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, igb_setup_tc_block_cb, adapter, adapter);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, igb_setup_tc_block_cb, adapter, adapter, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, igb_setup_tc_block_cb, adapter); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,9 +1,9 @@
 static int ixgbe_setup_tc_block(struct net_device *dev, struct tc_block_offload *f) {
   struct ixgbe_adapter *adapter = netdev_priv(dev);
   if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, ixgbe_setup_tc_block_cb, adapter, adapter);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, ixgbe_setup_tc_block_cb, adapter, adapter, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, ixgbe_setup_tc_block_cb, adapter); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,9 +1,9 @@
 static int nfp_bpf_setup_tc_block(struct net_device *netdev, struct tc_block_offload *f) {
   struct nfp_net *nn = netdev_priv(netdev);
   if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, nfp_bpf_setup_tc_block_cb, nn, nn);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, nfp_bpf_setup_tc_block_cb, nn, nn, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, nfp_bpf_setup_tc_block_cb, nn); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,9 +1,9 @@
 static int nsim_setup_tc_block(struct net_device *dev, struct tc_block_offload *f) {
   struct netdevsim *ns = netdev_priv(dev);
   if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, nsim_setup_tc_block_cb, ns, ns);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, nsim_setup_tc_block_cb, ns, ns, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, nsim_setup_tc_block_cb, ns); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,9 +1,9 @@
 static int nfp_flower_setup_tc_block(struct net_device *netdev, struct tc_block_offload *f) {
   struct nfp_repr *repr = netdev_priv(netdev);
   if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, nfp_flower_setup_tc_block_cb, repr, repr);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, nfp_flower_setup_tc_block_cb, repr, repr, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, nfp_flower_setup_tc_block_cb, repr); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,14 +1,14 @@
 static int dsa_slave_setup_tc_block(struct net_device *dev, struct tc_block_offload *f) {
   tc_setup_cb_t *cb;
   if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
     cb = dsa_slave_setup_tc_block_cb_ig;
   else if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS)
     cb = dsa_slave_setup_tc_block_cb_eg;
   else
     return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, cb, dev, dev);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, cb, dev, dev, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, cb, dev); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,30 +1,30 @@
 static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port, struct tc_block_offload *f) {
   tc_setup_cb_t *cb;
   bool ingress;
   int err;
   if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) {
     cb = mlxsw_sp_setup_tc_block_cb_matchall_ig;
     ingress = true;
   } else if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS) {
     cb = mlxsw_sp_setup_tc_block_cb_matchall_eg;
     ingress = false;
   } else {
     return -EOPNOTSUPP;
   }
   switch (f->command) {
   case TC_BLOCK_BIND:
-    err = tcf_block_cb_register(f->block, cb, mlxsw_sp_port, mlxsw_sp_port);
+    err = tcf_block_cb_register(f->block, cb, mlxsw_sp_port, mlxsw_sp_port, f->extack);
     if (err) return err;
     err = mlxsw_sp_setup_tc_block_flower_bind(mlxsw_sp_port, f->block, ingress);
     if (err) {
       tcf_block_cb_unregister(f->block, cb, mlxsw_sp_port);
       return err;
     }
     return 0;
   case TC_BLOCK_UNBIND:
     mlxsw_sp_setup_tc_block_flower_unbind(mlxsw_sp_port, f->block, ingress);
     tcf_block_cb_unregister(f->block, cb, mlxsw_sp_port);
     return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,8 +1,8 @@
 static int stmmac_setup_tc_block(struct stmmac_priv *priv, struct tc_block_offload *f) {
   if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP;
   switch (f->command) {
-  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, stmmac_setup_tc_block_cb, priv, priv);
+  case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, stmmac_setup_tc_block_cb, priv, priv, f->extack);
   case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, stmmac_setup_tc_block_cb, priv); return 0;
   default: return -EOPNOTSUPP;
   }
 }<sep>@@
struct tc_block_offload *f;
expression e1,e2,e3;
@@
tcf_block_cb_register(f->block, e1,e2,e3
+                                            , f->extack
                     )
--- initial
+++ final
@@ -1,10 +1,10 @@
 static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) {
   struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
   struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
   /* The ADSP will covert the FE rate to 48k, stereo */
   rate->min = rate->max = 48000;
   channels->min = channels->max = 2;
   /* set SSP0 to 16 bit */
-  snd_mask_set(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT - SNDRV_PCM_HW_PARAM_FIRST_MASK], SNDRV_PCM_FORMAT_S16_LE);
+  params_set_format(params, SNDRV_PCM_FORMAT_S16_LE);
   return 0;
 }<sep>@@
expression params,e1,e2;
@@
-       snd_mask_set(&params->masks[e1], e2);
+       params_set_format(params, e2);
--- initial
+++ final
@@ -1,12 +1,12 @@
 static int broxton_ssp_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) {
   struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
   struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
   struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
   /* The ADSP will convert the FE rate to 48k, stereo */
   rate->min = rate->max = 48000;
   channels->min = channels->max = DUAL_CHANNEL;
   /* set SSP to 24 bit */
   snd_mask_none(fmt);
-  snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+  snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
   return 0;
 }<sep>@@
expression fmt,e;
type T;
@@
-       snd_mask_set(fmt, (T)e);
+       snd_mask_set_format(fmt, e);
--- initial
+++ final
@@ -1,12 +1,12 @@
 static int broxton_ssp5_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) {
   struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
   struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
   struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
   /* The ADSP will covert the FE rate to 48k, stereo */
   rate->min = rate->max = 48000;
   channels->min = channels->max = 2;
   /* set SSP5 to 24 bit */
   snd_mask_none(fmt);
-  snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+  snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
   return 0;
 }<sep>@@
expression fmt,e;
type T;
@@
-       snd_mask_set(fmt, (T)e);
+       snd_mask_set_format(fmt, e);
--- initial
+++ final
@@ -1,12 +1,12 @@
 static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) {
   struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
   struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
   struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
   /* The ADSP will convert the FE rate to 48k, stereo */
   rate->min = rate->max = 48000;
   channels->min = channels->max = DUAL_CHANNEL;
   /* set SSP to 24 bit */
   snd_mask_none(fmt);
-  snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+  snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
   return 0;
 }<sep>@@
expression fmt,e;
type T;
@@
-       snd_mask_set(fmt, (T)e);
+       snd_mask_set_format(fmt, e);
--- initial
+++ final
@@ -1,23 +1,23 @@
 static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) {
   struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
   struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
   struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
   struct snd_soc_dpcm *dpcm = container_of(params, struct snd_soc_dpcm, hw_params);
   struct snd_soc_dai_link *fe_dai_link = dpcm->fe->dai_link;
   struct snd_soc_dai_link *be_dai_link = dpcm->be->dai_link;
   /*
    * The ADSP will convert the FE rate to 48k, stereo, 24 bit
    */
   if (!strcmp(fe_dai_link->name, "Kbl Audio Port") || !strcmp(fe_dai_link->name, "Kbl Audio Headset Playback") || !strcmp(fe_dai_link->name, "Kbl Audio Capture Port")) {
     rate->min = rate->max = 48000;
     channels->min = channels->max = 2;
     snd_mask_none(fmt);
-    snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+    snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
   }
   /*
    * The speaker on the SSP0 supports S16_LE and not S24_LE.
    * thus changing the mask here
    */
-  if (!strcmp(be_dai_link->name, "SSP0-Codec")) snd_mask_set(fmt, SNDRV_PCM_FORMAT_S16_LE);
+  if (!strcmp(be_dai_link->name, "SSP0-Codec")) snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);
   return 0;
 }<sep>@@
expression fmt,e;
type T;
@@
-       snd_mask_set(fmt, (T)e);
+       snd_mask_set_format(fmt, e);
--- initial
+++ final
@@ -1,28 +1,28 @@
 static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) {
   struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
   struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
   struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
   struct snd_soc_dpcm *dpcm = container_of(params, struct snd_soc_dpcm, hw_params);
   struct snd_soc_dai_link *fe_dai_link = dpcm->fe->dai_link;
   struct snd_soc_dai_link *be_dai_link = dpcm->be->dai_link;
   /*
    * The ADSP will convert the FE rate to 48k, stereo, 24 bit
    */
   if (!strcmp(fe_dai_link->name, "Kbl Audio Port") || !strcmp(fe_dai_link->name, "Kbl Audio Headset Playback") || !strcmp(fe_dai_link->name, "Kbl Audio Capture Port")) {
     rate->min = rate->max = 48000;
     channels->min = channels->max = 2;
     snd_mask_none(fmt);
-    snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+    snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
   } else if (!strcmp(fe_dai_link->name, "Kbl Audio DMIC cap")) {
     if (params_channels(params) == 2 || DMIC_CH(dmic_constraints) == 2)
       channels->min = channels->max = 2;
     else
       channels->min = channels->max = 4;
   }
   /*
    * The speaker on the SSP0 supports S16_LE and not S24_LE.
    * thus changing the mask here
    */
-  if (!strcmp(be_dai_link->name, "SSP0-Codec")) snd_mask_set(fmt, SNDRV_PCM_FORMAT_S16_LE);
+  if (!strcmp(be_dai_link->name, "SSP0-Codec")) snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);
   return 0;
 }<sep>@@
expression fmt,e;
type T;
@@
-       snd_mask_set(fmt, (T)e);
+       snd_mask_set_format(fmt, e);
--- initial
+++ final
@@ -1,12 +1,12 @@
 static int skylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) {
   struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
   struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
   struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
   /* The ADSP will covert the FE rate to 48k, stereo */
   rate->min = rate->max = 48000;
   channels->min = channels->max = 2;
   /* set SSP0 to 24 bit */
   snd_mask_none(fmt);
-  snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+  snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
   return 0;
 }<sep>@@
expression fmt,e;
type T;
@@
-       snd_mask_set(fmt, (T)e);
+       snd_mask_set_format(fmt, e);
--- initial
+++ final
@@ -1,12 +1,12 @@
 static int skylake_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) {
   struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
   struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
   struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
   /* The output is 48KHz, stereo, 16bits */
   rate->min = rate->max = 48000;
   channels->min = channels->max = 2;
   /* set SSP0 to 24 bit */
   snd_mask_none(fmt);
-  snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+  snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
   return 0;
 }<sep>@@
expression fmt,e;
type T;
@@
-       snd_mask_set(fmt, (T)e);
+       snd_mask_set_format(fmt, e);
--- initial
+++ final
@@ -1,11 +1,11 @@
 static int be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) {
   struct fsl_asoc_card_priv *priv = snd_soc_card_get_drvdata(rtd->card);
   struct snd_interval *rate;
   struct snd_mask *mask;
   rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
   rate->max = rate->min = priv->asrc_rate;
   mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
   snd_mask_none(mask);
-  snd_mask_set(mask, (__force int)priv->asrc_format);
+  snd_mask_set_format(mask, priv->asrc_format);
   return 0;
 }<sep>@@
expression fmt,e;
type T;
@@
-       snd_mask_set(fmt, (T)e);
+       snd_mask_set_format(fmt, e);