projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
pci
/
ttpci
/
av7110.c
diff --git
a/drivers/media/pci/ttpci/av7110.c
b/drivers/media/pci/ttpci/av7110.c
index 4bd8bd56befc2230d739c89c7deea63b0644bd25..4656d4a10af062286f313ef0aa4ac73f10b45014 100644
(file)
--- a/
drivers/media/pci/ttpci/av7110.c
+++ b/
drivers/media/pci/ttpci/av7110.c
@@
-2367,8
+2367,8
@@
static int frontend_init(struct av7110 *av7110)
* The same behaviour of missing VSYNC can be duplicated on budget
* cards, by seting DD1_INIT trigger mode 7 in 3rd nibble.
*/
* The same behaviour of missing VSYNC can be duplicated on budget
* cards, by seting DD1_INIT trigger mode 7 in 3rd nibble.
*/
-static int
__devinit
av7110_attach(struct saa7146_dev* dev,
-
struct saa7146_pci_extension_data *pci_ext)
+static int av7110_attach(struct saa7146_dev* dev,
+ struct saa7146_pci_extension_data *pci_ext)
{
const int length = TS_WIDTH * TS_HEIGHT;
struct pci_dev *pdev = dev->pci;
{
const int length = TS_WIDTH * TS_HEIGHT;
struct pci_dev *pdev = dev->pci;
@@
-2761,7
+2761,7
@@
err_kfree_0:
goto out;
}
goto out;
}
-static int
__devexit
av7110_detach(struct saa7146_dev* saa)
+static int av7110_detach(struct saa7146_dev* saa)
{
struct av7110 *av7110 = saa->ext_priv;
dprintk(4, "%p\n", av7110);
{
struct av7110 *av7110 = saa->ext_priv;
dprintk(4, "%p\n", av7110);
@@
-2910,7
+2910,7
@@
static struct saa7146_extension av7110_extension_driver = {
.module = THIS_MODULE,
.pci_tbl = &pci_tbl[0],
.attach = av7110_attach,
.module = THIS_MODULE,
.pci_tbl = &pci_tbl[0],
.attach = av7110_attach,
- .detach =
__devexit_p(av7110_detach)
,
+ .detach =
av7110_detach
,
.irq_mask = MASK_19 | MASK_03 | MASK_10,
.irq_func = av7110_irq,
.irq_mask = MASK_19 | MASK_03 | MASK_10,
.irq_func = av7110_irq,