Merge pull request torvalds#108 from jdenson12/saa716x-fixes

Saa716x fixes
CkNoSFeRaTU · Sep 10, 2015 · 6f2f8f3 · 6f2f8f3
2 parents 8e58254 + 3dfe7f9
commit 6f2f8f3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 49 deletions.
diff --git a/drivers/media/pci/saa716x/saa716x_budget.c b/drivers/media/pci/saa716x/saa716x_budget.c
@@ -383,7 +383,9 @@ static int saa716x_vp1028_frontend_attach(struct saa716x_adapter *adapter, int c
 		mutex_unlock(&saa716x->adap_lock);
 
 		dprintk(SAA716x_ERROR, 1, "Probing for MB86A16 (DVB-S/DSS)");
-		adapter->fe = mb86a16_attach(&vp1028_mb86a16_config, &i2c->i2c_adapter);
+		adapter->fe = dvb_attach(mb86a16_attach,
+					 &vp1028_mb86a16_config,
+					 &i2c->i2c_adapter);
 		if (adapter->fe) {
 			dprintk(SAA716x_ERROR, 1, "found MB86A16 DVB-S/DSS frontend @0x%02x",
 				vp1028_mb86a16_config.demod_address);
@@ -718,8 +720,8 @@ static int saa716x_tbs6284_frontend_attach(struct saa716x_adapter *adapter, int
 	}
 
 	/* attach frontend */
-	adapter->fe = cxd2820r_attach(&cxd2820r_config[count & 1],
-				&i2c->i2c_adapter, NULL);
+	adapter->fe = dvb_attach(cxd2820r_attach, &cxd2820r_config[count & 1],
+				 &i2c->i2c_adapter, NULL);
 	if (!adapter->fe)
 		goto err;
 
@@ -816,8 +818,8 @@ static int saa716x_tbs6280_frontend_attach(struct saa716x_adapter *adapter, int
 	}
 
 	/* attach frontend */
-	adapter->fe = cxd2820r_attach(&cxd2820r_config[count],
-				&i2c->i2c_adapter, NULL);
+	adapter->fe = dvb_attach(cxd2820r_attach, &cxd2820r_config[count],
+				 &i2c->i2c_adapter, NULL);
 	if (!adapter->fe)
 		goto err;
 
@@ -1103,8 +1105,8 @@ static int saa716x_tbs6220_frontend_attach(struct saa716x_adapter *adapter, int
 		goto err;
 
 	/* attach frontend */
-	adapter->fe = cxd2820r_attach(&cxd2820r_config[0],
-				&i2c->i2c_adapter, NULL);
+	adapter->fe = dvb_attach(cxd2820r_attach, &cxd2820r_config[0],
+				 &i2c->i2c_adapter, NULL);
 	if (!adapter->fe)
 		goto err;
 
@@ -2387,18 +2389,7 @@ static struct pci_driver saa716x_budget_pci_driver = {
 	.remove			= saa716x_budget_pci_remove,
 };
 
-static int __init saa716x_budget_init(void)
-{
-	return pci_register_driver(&saa716x_budget_pci_driver);
-}
-
-static void __exit saa716x_budget_exit(void)
-{
-	return pci_unregister_driver(&saa716x_budget_pci_driver);
-}
-
-module_init(saa716x_budget_init);
-module_exit(saa716x_budget_exit);
+module_pci_driver(saa716x_budget_pci_driver);
 
 MODULE_DESCRIPTION("SAA716x Budget driver");
 MODULE_AUTHOR("Manu Abraham");

diff --git a/drivers/media/pci/saa716x/saa716x_ff_main.c b/drivers/media/pci/saa716x/saa716x_ff_main.c
@@ -1800,18 +1800,7 @@ static struct pci_driver saa716x_ff_pci_driver = {
 	.remove			= saa716x_ff_pci_remove,
 };
 
-static int __init saa716x_ff_init(void)
-{
-	return pci_register_driver(&saa716x_ff_pci_driver);
-}
-
-static void __exit saa716x_ff_exit(void)
-{
-	return pci_unregister_driver(&saa716x_ff_pci_driver);
-}
-
-module_init(saa716x_ff_init);
-module_exit(saa716x_ff_exit);
+module_pci_driver(saa716x_ff_pci_driver);
 
 MODULE_DESCRIPTION("SAA716x FF driver");
 MODULE_AUTHOR("Manu Abraham");

diff --git a/drivers/media/pci/saa716x/saa716x_hybrid.c b/drivers/media/pci/saa716x/saa716x_hybrid.c
@@ -374,7 +374,8 @@ static int saa716x_vp6090_frontend_attach(struct saa716x_adapter *adapter, int c
 		goto exit;
 	}
 #endif
-	adapter->fe = tda10046_attach(&tda1004x_vp6090_config, &i2c->i2c_adapter);
+	adapter->fe = dvb_attach(tda10046_attach, &tda1004x_vp6090_config,
+				 &i2c->i2c_adapter);
 	if (adapter->fe == NULL) {
 		dprintk(SAA716x_ERROR, 1, "Frontend attach failed");
 		return -ENODEV;
@@ -474,8 +475,9 @@ static int saa716x_atlantis_frontend_attach(struct saa716x_adapter *adapter,
 		saa716x_gpio_write(saa716x, reset_gpio, 1);
 		msleep(10);
 
-		adapter->fe = tda10046_attach(&tda1004x_atlantis_config,
-					      &i2c->i2c_adapter);
+		adapter->fe = dvb_attach(tda10046_attach,
+					 &tda1004x_atlantis_config,
+					 &i2c->i2c_adapter);
 		if (adapter->fe == NULL)
 			goto exit;
 
@@ -585,8 +587,9 @@ static int saa716x_nemo_frontend_attach(struct saa716x_adapter *adapter, int cou
 		saa716x_gpio_write(saa716x, 14, 1);
 		msleep(10);
 
-		adapter->fe = tda10046_attach(&tda1004x_nemo_config,
-					      &demod_i2c->i2c_adapter);
+		adapter->fe = dvb_attach(tda10046_attach,
+					 &tda1004x_nemo_config,
+					 &demod_i2c->i2c_adapter);
 		if (adapter->fe) {
 			dprintk(SAA716x_ERROR, 1, "found TDA10046 DVB-T frontend @0x%02x",
 				tda1004x_nemo_config.demod_address);
@@ -708,18 +711,7 @@ static struct pci_driver saa716x_hybrid_pci_driver = {
 	.remove			= saa716x_hybrid_pci_remove,
 };
 
-static int __init saa716x_hybrid_init(void)
-{
-	return pci_register_driver(&saa716x_hybrid_pci_driver);
-}
-
-static void __exit saa716x_hybrid_exit(void)
-{
-	return pci_unregister_driver(&saa716x_hybrid_pci_driver);
-}
-
-module_init(saa716x_hybrid_init);
-module_exit(saa716x_hybrid_exit);
+module_pci_driver(saa716x_hybrid_pci_driver);
 
 MODULE_DESCRIPTION("SAA716x Hybrid driver");
 MODULE_AUTHOR("Manu Abraham");

diff --git a/drivers/media/pci/saa716x/saa716x_i2c.c b/drivers/media/pci/saa716x/saa716x_i2c.c
@@ -610,7 +610,7 @@ static int saa716x_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, i
 
 static u32 saa716x_i2c_func(struct i2c_adapter *adapter)
 {
-	return I2C_FUNC_SMBUS_EMUL;
+	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
 }
 
 static const struct i2c_algorithm saa716x_algo = {