diff options
| author | Daniel Scheller <d.scheller@gmx.net> | 2018-03-17 10:55:32 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-05-04 14:20:24 -0400 |
| commit | 2dc3e050466c7399705512c6797a400de9224439 (patch) | |
| tree | b3d3cd2d50284be91971801bf66442d2cd9a5ef0 | |
| parent | 53dcd70eb710607b2d4085ca91a433cd9feb7b41 (diff) | |
| download | linux-2dc3e050466c7399705512c6797a400de9224439.tar.bz2 | |
media: ddbridge, cxd2099: include guard, fix unneeded NULL init, strings
Three really tiny minors in this single commit which all on their own
would just clutter up the commit history unnecessarily:
* ddbridge-regs.h is lacking an include guard. Add it.
* Fix an unnecessary NULL initialisation in ddbridge-ci. The declaration
of the ci struct ptr is immediately followed by kzalloc().
* Clarify that the CXD2099AR is a Sony device in the cxd2099 driver at a
few places including Kconfig.
Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Acked-by: Jasmin Jessich <jasmin@anw.at>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
| -rw-r--r-- | drivers/media/dvb-frontends/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/cxd2099.c | 4 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/cxd2099.h | 2 | ||||
| -rw-r--r-- | drivers/media/pci/ddbridge/ddbridge-ci.c | 2 | ||||
| -rw-r--r-- | drivers/media/pci/ddbridge/ddbridge-regs.h | 4 |
5 files changed, 9 insertions, 5 deletions
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig index 0712069fd9fe..55e36a4f5215 100644 --- a/drivers/media/dvb-frontends/Kconfig +++ b/drivers/media/dvb-frontends/Kconfig @@ -903,7 +903,7 @@ comment "Common Interface (EN50221) controller drivers" depends on DVB_CORE config DVB_CXD2099 - tristate "CXD2099AR Common Interface driver" + tristate "Sony CXD2099AR Common Interface driver" depends on DVB_CORE && I2C select REGMAP_I2C default m if !MEDIA_SUBDRV_AUTOSELECT diff --git a/drivers/media/dvb-frontends/cxd2099.c b/drivers/media/dvb-frontends/cxd2099.c index c0a5849b76bb..4a0ce3037fd6 100644 --- a/drivers/media/dvb-frontends/cxd2099.c +++ b/drivers/media/dvb-frontends/cxd2099.c @@ -1,5 +1,5 @@ /* - * cxd2099.c: Driver for the CXD2099AR Common Interface Controller + * cxd2099.c: Driver for the Sony CXD2099AR Common Interface Controller * * Copyright (C) 2010-2013 Digital Devices GmbH * @@ -699,6 +699,6 @@ static struct i2c_driver cxd2099_driver = { module_i2c_driver(cxd2099_driver); -MODULE_DESCRIPTION("CXD2099AR Common Interface controller driver"); +MODULE_DESCRIPTION("Sony CXD2099AR Common Interface controller driver"); MODULE_AUTHOR("Ralph Metzler"); MODULE_LICENSE("GPL"); diff --git a/drivers/media/dvb-frontends/cxd2099.h b/drivers/media/dvb-frontends/cxd2099.h index 8fa45a4c615a..ec1910dec3f3 100644 --- a/drivers/media/dvb-frontends/cxd2099.h +++ b/drivers/media/dvb-frontends/cxd2099.h @@ -1,5 +1,5 @@ /* - * cxd2099.h: Driver for the CXD2099AR Common Interface Controller + * cxd2099.h: Driver for the Sony CXD2099AR Common Interface Controller * * Copyright (C) 2010-2011 Digital Devices GmbH * diff --git a/drivers/media/pci/ddbridge/ddbridge-ci.c b/drivers/media/pci/ddbridge/ddbridge-ci.c index a9dbc4ebf94f..cfe23d02e561 100644 --- a/drivers/media/pci/ddbridge/ddbridge-ci.c +++ b/drivers/media/pci/ddbridge/ddbridge-ci.c @@ -164,7 +164,7 @@ static struct dvb_ca_en50221 en_templ = { static void ci_attach(struct ddb_port *port) { - struct ddb_ci *ci = NULL; + struct ddb_ci *ci; ci = kzalloc(sizeof(*ci), GFP_KERNEL); if (!ci) diff --git a/drivers/media/pci/ddbridge/ddbridge-regs.h b/drivers/media/pci/ddbridge/ddbridge-regs.h index 23d74ff83fe4..b978b5991940 100644 --- a/drivers/media/pci/ddbridge/ddbridge-regs.h +++ b/drivers/media/pci/ddbridge/ddbridge-regs.h @@ -17,6 +17,9 @@ * http://www.gnu.org/copyleft/gpl.html */ +#ifndef __DDBRIDGE_REGS_H__ +#define __DDBRIDGE_REGS_H__ + /* ------------------------------------------------------------------------- */ /* SPI Controller */ @@ -154,3 +157,4 @@ #define LNB_BUF_LEVEL(i) (LNB_BASE + (i) * 0x20 + 0x10) #define LNB_BUF_WRITE(i) (LNB_BASE + (i) * 0x20 + 0x14) +#endif /* __DDBRIDGE_REGS_H__ */ |