Skip to contentSkip to conversation

ddbridge, cxd2099: include guard, fix unneeded NULL init, strings

PATCH In review Daniel Scheller 2 participants 2 messages Mar 17, 2018

Subsystems (3)
Media (V4L/DVB) Media drivers for digital devices PCIe devices Media drivers for CXD2099AR ci controllers
lore
Share & tools
lore

Daniel Scheller

author
#0 lore raw

PATCH 1/1 ddbridge, cxd2099: include guard, fix unneeded NULL init, strings

From: Daniel Scheller <[email protected]>

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.

Cc Jasmin for the cxd2099 changes.

Cc Jasmin Jessich <[email protected]>
Signed-off-by Daniel Scheller <[email protected]>

---
Please pull for the 4.17 merge window.

 drivers/media/dvb-frontends/Kconfig        | 2 +-
 drivers/media/dvb-frontends/cxd2099.c      | 4 ++--
 drivers/media/dvb-frontends/cxd2099.h      | 2 +-
 drivers/media/pci/ddbridge/ddbridge-ci.c   | 2 +-
 drivers/media/pci/ddbridge/ddbridge-regs.h | 4 ++++
 5 files changed, 9 insertions(+), 5 deletions(-)
drivers/media/dvb-frontends/Kconfig +1 -1
index 687086cdb870..fda645cbe68e 100644
@@ -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
drivers/media/dvb-frontends/cxd2099.c +2 -2
index c0a5849b76bb..4a0ce3037fd6 100644
@@ -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");
drivers/media/dvb-frontends/cxd2099.h +1 -1
index 8fa45a4c615a..ec1910dec3f3 100644
@@ -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
  *
drivers/media/pci/ddbridge/ddbridge-ci.c +1 -1
index a9dbc4ebf94f..cfe23d02e561 100644
@@ -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)
drivers/media/pci/ddbridge/ddbridge-regs.h +4 -0
index 23d74ff83fe4..b978b5991940 100644
@@ -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__ */
Signature · 1 line
2.16.1