diff --git a/dvb-frontends/cxd2820r_core.c b/dvb-frontends/cxd2820r_core.c
index 285d500..1f87eac 100644
--- a/dvb-frontends/cxd2820r_core.c
+++ b/dvb-frontends/cxd2820r_core.c
@@ -717,7 +717,7 @@ static int cxd2820r_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int cxd2820r_remove(struct i2c_client *client)
+static void cxd2820r_remove(struct i2c_client *client)
 {
 	struct cxd2820r_priv *priv = i2c_get_clientdata(client);
 
@@ -733,8 +733,6 @@ static int cxd2820r_remove(struct i2c_client *client)
 	regmap_exit(priv->regmap[0]);
 
 	kfree(priv);
-
-	return 0;
 }
 
 static const struct i2c_device_id cxd2820r_id_table[] = {
diff --git a/dvb-frontends/gx1503.c b/dvb-frontends/gx1503.c
index c18e8ba..092493a 100644
--- a/dvb-frontends/gx1503.c
+++ b/dvb-frontends/gx1503.c
@@ -551,7 +551,7 @@ static int gx1503_probe( struct i2c_client *client,
 	dev_dbg(&client->dev,"failed = %d\n",ret);
 	return ret;
 }
-static int gx1503_remove(struct i2c_client *client)
+static void gx1503_remove(struct i2c_client *client)
 {
 	struct gx1503_dev*dev = i2c_get_clientdata(client);
 	
@@ -565,10 +565,8 @@ static int gx1503_remove(struct i2c_client *client)
 	dev->fe.ops.release = NULL;
 	dev->fe.demodulator_priv = NULL;
 	kfree(dev);
-
-	return 0;
-
 }
+
 static const struct i2c_device_id gx1503_id_table[] = {
 			{"gx1503",0},
 			{}
diff --git a/dvb-frontends/m88rs6060.c b/dvb-frontends/m88rs6060.c
index f4e7ff5..8b104b1 100644
--- a/dvb-frontends/m88rs6060.c
+++ b/dvb-frontends/m88rs6060.c
@@ -3336,7 +3336,7 @@ static int m88rs6060_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int m88rs6060_remove(struct i2c_client *client)
+static void m88rs6060_remove(struct i2c_client *client)
 {
 	struct m88rs6060_dev *dev = i2c_get_clientdata(client);
 	dev_dbg(&client->dev, "\n");
@@ -3348,7 +3348,6 @@ static int m88rs6060_remove(struct i2c_client *client)
 	dev->fe.demodulator_priv = NULL;
 
 	kfree(dev);
-	return 0;
 }
 
 static const struct i2c_device_id m88rs6060_id_table[] = {
diff --git a/dvb-frontends/mtv23x.c b/dvb-frontends/mtv23x.c
index 98f23f3..f89b772 100644
--- a/dvb-frontends/mtv23x.c
+++ b/dvb-frontends/mtv23x.c
@@ -2339,14 +2339,12 @@ static int mtv23x_probe(struct i2c_client*client,
 	dev_dbg(&client->dev,"failed = %d\n",ret);
 	return ret;
 }
-static int mtv23x_remove(struct i2c_client*client)
+static void mtv23x_remove(struct i2c_client *client)
 {
 	struct mtv23x_dev*dev = i2c_get_clientdata(client);
 
 	regmap_exit(dev->regmap);
 	kfree(dev);
-
-	return 0;
 }
 
 static const struct i2c_device_id mtv23x_id_table[] ={
diff --git a/dvb-frontends/si2168.c b/dvb-frontends/si2168.c
index 42af0dd..78a79f7 100644
--- a/dvb-frontends/si2168.c
+++ b/dvb-frontends/si2168.c
@@ -940,7 +940,7 @@ static int si2168_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int si2168_remove(struct i2c_client *client)
+static void si2168_remove(struct i2c_client *client)
 {
 	struct si2168_dev *dev = i2c_get_clientdata(client);
 
@@ -952,8 +952,6 @@ static int si2168_remove(struct i2c_client *client)
 	dev->fe.demodulator_priv = NULL;
 
 	kfree(dev);
-
-	return 0;
 }
 
 static const struct i2c_device_id si2168_id_table[] = {
diff --git a/dvb-frontends/si2183.c b/dvb-frontends/si2183.c
index ca24896..910d03b 100644
--- a/dvb-frontends/si2183.c
+++ b/dvb-frontends/si2183.c
@@ -1592,7 +1592,7 @@ static int si2183_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int si2183_remove(struct i2c_client *client)
+static void si2183_remove(struct i2c_client *client)
 {
 	struct si2183_dev *dev = i2c_get_clientdata(client);
 
@@ -1615,8 +1615,6 @@ static int si2183_remove(struct i2c_client *client)
 	dev->fe.demodulator_priv = NULL;
 
 	kfree(dev);
-
-	return 0;
 }
 
 static const struct i2c_device_id si2183_id_table[] = {
diff --git a/dvb-frontends/stv090x.c b/dvb-frontends/stv090x.c
index f5ed2dc..6c9ffec 100644
--- a/dvb-frontends/stv090x.c
+++ b/dvb-frontends/stv090x.c
@@ -5207,12 +5207,11 @@ static int stv090x_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int stv090x_remove(struct i2c_client *client)
+static void stv090x_remove(struct i2c_client *client)
 {
 	struct stv090x_state *state = i2c_get_clientdata(client);
 
 	stv090x_release(&state->frontend);
-	return 0;
 }
 
 struct dvb_frontend *stv090x_attach(struct stv090x_config *config,
diff --git a/dvb-frontends/stv6110x.c b/dvb-frontends/stv6110x.c
index 5012d02..fbc4dbd 100644
--- a/dvb-frontends/stv6110x.c
+++ b/dvb-frontends/stv6110x.c
@@ -436,12 +436,11 @@ static int stv6110x_probe(struct i2c_client *client,
 	return 0;
 }
 
-static int stv6110x_remove(struct i2c_client *client)
+static void stv6110x_remove(struct i2c_client *client)
 {
 	struct stv6110x_state *stv6110x = i2c_get_clientdata(client);
 
 	stv6110x_release(stv6110x->frontend);
-	return 0;
 }
 
 const struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
diff --git a/saa716x/saa716x_budget.c b/saa716x/saa716x_budget.c
index d4d7223..f256703 100644
--- a/saa716x/saa716x_budget.c
+++ b/saa716x/saa716x_budget.c
@@ -298,10 +298,10 @@ static void demux_worker(unsigned long data)
 	do {
 		u8 *data = (u8 *)fgpi_entry->dma_buf[fgpi_entry->read_index].mem_virt;
 
-		pci_dma_sync_sg_for_cpu(saa716x->pdev,
+		dma_sync_sg_for_cpu(&saa716x->pdev->dev,
 			fgpi_entry->dma_buf[fgpi_entry->read_index].sg_list,
 			fgpi_entry->dma_buf[fgpi_entry->read_index].list_len,
-			PCI_DMA_FROMDEVICE);
+			DMA_FROM_DEVICE);
 
 		dvb_dmx_swfilter(demux, data, 348 * 188);
 
diff --git a/saa716x/saa716x_ff_main.c b/saa716x/saa716x_ff_main.c
index 141bde4..6ddced7 100644
--- a/saa716x/saa716x_ff_main.c
+++ b/saa716x/saa716x_ff_main.c
@@ -613,15 +613,15 @@ static void video_vip_worker(unsigned long data)
 	}
 
 	do {
-		pci_dma_sync_sg_for_cpu(saa716x->pdev,
+		dma_sync_sg_for_cpu(&saa716x->pdev->dev,
 			vip_entry->dma_buf[0][vip_entry->read_index].sg_list,
 			vip_entry->dma_buf[0][vip_entry->read_index].list_len,
-			PCI_DMA_FROMDEVICE);
+			DMA_FROM_DEVICE);
 		if (vip_entry->dual_channel) {
-			pci_dma_sync_sg_for_cpu(saa716x->pdev,
+			dma_sync_sg_for_cpu(&saa716x->pdev->dev,
 				vip_entry->dma_buf[1][vip_entry->read_index].sg_list,
 				vip_entry->dma_buf[1][vip_entry->read_index].list_len,
-				PCI_DMA_FROMDEVICE);
+				DMA_FROM_DEVICE);
 		}
 
 		vip_entry->read_index = (vip_entry->read_index + 1) & 7;
@@ -1289,10 +1289,10 @@ static void demux_worker(unsigned long data)
 	do {
 		u8 *data = (u8 *)fgpi_entry->dma_buf[fgpi_entry->read_index].mem_virt;
 
-		pci_dma_sync_sg_for_cpu(saa716x->pdev,
+		dma_sync_sg_for_cpu(&saa716x->pdev->dev,
 			fgpi_entry->dma_buf[fgpi_entry->read_index].sg_list,
 			fgpi_entry->dma_buf[fgpi_entry->read_index].list_len,
-			PCI_DMA_FROMDEVICE);
+			DMA_FROM_DEVICE);
 
 		dvb_dmx_swfilter(demux, data, 348 * 188);
 
diff --git a/saa716x/saa716x_hybrid.c b/saa716x/saa716x_hybrid.c
index b84d7ba..1594fe1 100644
--- a/saa716x/saa716x_hybrid.c
+++ b/saa716x/saa716x_hybrid.c
@@ -283,10 +283,10 @@ static void demux_worker(unsigned long data)
 	do {
 		u8 *data = (u8 *)fgpi_entry->dma_buf[fgpi_entry->read_index].mem_virt;
 
-		pci_dma_sync_sg_for_cpu(saa716x->pdev,
+		dma_sync_sg_for_cpu(&saa716x->pdev->dev,
 			fgpi_entry->dma_buf[fgpi_entry->read_index].sg_list,
 			fgpi_entry->dma_buf[fgpi_entry->read_index].list_len,
-			PCI_DMA_FROMDEVICE);
+			DMA_FROM_DEVICE);
 
 		dvb_dmx_swfilter(demux, data, 348 * 188);
 
diff --git a/saa716x/saa716x_pci.c b/saa716x/saa716x_pci.c
index c33a376..1af53b6 100644
--- a/saa716x/saa716x_pci.c
+++ b/saa716x/saa716x_pci.c
@@ -163,14 +163,14 @@ int saa716x_pci_init(struct saa716x_dev *saa716x)
 		goto fail0;
 	}
 
-	if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
+	if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
 		use_dac = 1;
-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
+		err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
 		if (err) {
 			dprintk(SAA716x_ERROR, 1, "Unable to obtain 64bit DMA");
 			goto fail1;
 		}
-	} else if ((err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) {
+	} else if ((err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32))) != 0) {
 		dprintk(SAA716x_ERROR, 1, "Unable to obtain 32bit DMA");
 		goto fail1;
 	}
diff --git a/tbsecp3/tbsecp3-core.c b/tbsecp3/tbsecp3-core.c
index d8427e7..a9ad5cf 100644
--- a/tbsecp3/tbsecp3-core.c
+++ b/tbsecp3/tbsecp3-core.c
@@ -176,8 +176,8 @@ static int tbsecp3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	if (pci_enable_device(pdev) < 0)
 		return -ENODEV;
 
-	if(pci_set_dma_mask(pdev, DMA_BIT_MASK(64)))
-		if(pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))
+	if(dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)))
+		if(dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)))
 		{
 			dev_err(&pdev->dev, "64/32-bit PCI DMA not supported\n");
 			goto err0;	
diff --git a/tbsecp3/tbsecp3-dma.c b/tbsecp3/tbsecp3-dma.c
index a96ffe9..fe68888 100644
--- a/tbsecp3/tbsecp3-dma.c
+++ b/tbsecp3/tbsecp3-dma.c
@@ -126,9 +126,9 @@ void tbsecp3_dma_free(struct tbsecp3_dev *dev)
 		if (adapter->dma.buf[0] == NULL)
 			continue;
 
-		pci_free_consistent(dev->pci_dev,
+		dma_alloc_coherent(&dev->pci_dev->dev,
 			adapter->dma.page_size + 0x100,
-			adapter->dma.buf[0], adapter->dma.dma_addr);
+			&adapter->dma.dma_addr, GFP_ATOMIC);
 		adapter->dma.buf[0] = NULL;
 		adapter++;
 	}
@@ -149,9 +149,9 @@ int tbsecp3_dma_init(struct tbsecp3_dev *dev)
 		adapter->dma.buffer_size = dma_pkts[i] * TS_PACKET_SIZE;
 		adapter->dma.page_size = adapter->dma.buffer_size * TBSECP3_DMA_BUFFERS;
 
-		adapter->dma.buf[0] = pci_alloc_consistent(dev->pci_dev,
-				adapter->dma.page_size + 0x100,
-				&adapter->dma.dma_addr);
+		adapter->dma.buf[0] = dma_alloc_coherent(&dev->pci_dev->dev,
+			adapter->dma.page_size + 0x100,
+			&adapter->dma.dma_addr, GFP_ATOMIC);
 		if (!adapter->dma.buf[0])
 			goto err;
 
diff --git a/tuners/mxl603.c b/tuners/mxl603.c
index 3b06d3c..8747ef1 100644
--- a/tuners/mxl603.c
+++ b/tuners/mxl603.c
@@ -559,13 +559,11 @@ static int mxl603_probe(struct i2c_client *client,
 	pr_err("%s___failed=%d\n",__FUNCTION__, ret);
 	return ret;
 }
-static int mxl603_remove(struct i2c_client *client)
+static void mxl603_remove(struct i2c_client *client)
 {
 	struct mxl603_dev *dev = i2c_get_clientdata(client);
 
 	kfree(dev);
-	
-	return 0;
 }
 
  static const struct i2c_device_id mxl603_id_table[] = {
diff --git a/tuners/si2157.c b/tuners/si2157.c
index 542b05f..0092410 100644
--- a/tuners/si2157.c
+++ b/tuners/si2157.c
@@ -908,7 +908,7 @@ static int si2157_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int si2157_remove(struct i2c_client *client)
+static void si2157_remove(struct i2c_client *client)
 {
 	struct si2157_dev *dev = i2c_get_clientdata(client);
 	struct dvb_frontend *fe = dev->fe;
@@ -926,8 +926,6 @@ static int si2157_remove(struct i2c_client *client)
 	memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops));
 	fe->tuner_priv = NULL;
 	kfree(dev);
-
-	return 0;
 }
 
 static const struct i2c_device_id si2157_id_table[] = {
diff --git a/tuners/tda18212.c b/tuners/tda18212.c
index 9c12f89..5138cb0 100644
--- a/tuners/tda18212.c
+++ b/tuners/tda18212.c
@@ -256,7 +256,7 @@ static int tda18212_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int tda18212_remove(struct i2c_client *client)
+static void tda18212_remove(struct i2c_client *client)
 {
 	struct tda18212_dev *dev = i2c_get_clientdata(client);
 	struct dvb_frontend *fe = dev->cfg.fe;
@@ -266,8 +266,6 @@ static int tda18212_remove(struct i2c_client *client)
 	memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops));
 	fe->tuner_priv = NULL;
 	kfree(dev);
-
-	return 0;
 }
 
 static const struct i2c_device_id tda18212_id[] = {