Commit 80f13a08 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: cec-notifier: rename conn_name to port_name 



This argument refers to a stable name for an HDMI port, mostly i915
(ACPI) specific. Since we'll be introducing a more generic 'name' argument
as well later, rename this now to avoid confusion.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent eac5727d

drivers/media/cec/cec-notifier.c

+12 −12
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct cec_notifier { 
	struct kref kref;

	struct device *hdmi_dev;

	struct cec_connector_info conn_info;

	const char *conn_name;

	const char *port_name;

	struct cec_adapter *cec_adap;



	u16 phys_addr;
@@ -33,15 +33,15 @@ static LIST_HEAD(cec_notifiers); 
static DEFINE_MUTEX(cec_notifiers_lock);



struct cec_notifier *

cec_notifier_get_conn(struct device *hdmi_dev, const char *conn_name)

cec_notifier_get_conn(struct device *hdmi_dev, const char *port_name)

{

	struct cec_notifier *n;



	mutex_lock(&cec_notifiers_lock);

	list_for_each_entry(n, &cec_notifiers, head) {

		if (n->hdmi_dev == hdmi_dev &&

		    (!conn_name ||

		     (n->conn_name && !strcmp(n->conn_name, conn_name)))) {

		    (!port_name ||

		     (n->port_name && !strcmp(n->port_name, port_name)))) {

			kref_get(&n->kref);

			mutex_unlock(&cec_notifiers_lock);

			return n;
@@ -51,9 +51,9 @@ cec_notifier_get_conn(struct device *hdmi_dev, const char *conn_name) 
	if (!n)

		goto unlock;

	n->hdmi_dev = hdmi_dev;

	if (conn_name) {

		n->conn_name = kstrdup(conn_name, GFP_KERNEL);

		if (!n->conn_name) {

	if (port_name) {

		n->port_name = kstrdup(port_name, GFP_KERNEL);

		if (!n->port_name) {

			kfree(n);

			n = NULL;

			goto unlock;
@@ -76,7 +76,7 @@ static void cec_notifier_release(struct kref *kref) 
		container_of(kref, struct cec_notifier, kref);



	list_del(&n->head);

	kfree(n->conn_name);

	kfree(n->port_name);

	kfree(n);

}
@@ -88,10 +88,10 @@ static void cec_notifier_put(struct cec_notifier *n) 
}



struct cec_notifier *

cec_notifier_conn_register(struct device *hdmi_dev, const char *conn_name,

cec_notifier_conn_register(struct device *hdmi_dev, const char *port_name,

			   const struct cec_connector_info *conn_info)

{

	struct cec_notifier *n = cec_notifier_get_conn(hdmi_dev, conn_name);

	struct cec_notifier *n = cec_notifier_get_conn(hdmi_dev, port_name);



	if (!n)

		return n;
@@ -129,7 +129,7 @@ void cec_notifier_conn_unregister(struct cec_notifier *n) 
EXPORT_SYMBOL_GPL(cec_notifier_conn_unregister);



struct cec_notifier *

cec_notifier_cec_adap_register(struct device *hdmi_dev, const char *conn_name,

cec_notifier_cec_adap_register(struct device *hdmi_dev, const char *port_name,

			       struct cec_adapter *adap)

{

	struct cec_notifier *n;
@@ -137,7 +137,7 @@ cec_notifier_cec_adap_register(struct device *hdmi_dev, const char *conn_name, 
	if (WARN_ON(!adap))

		return NULL;



	n = cec_notifier_get_conn(hdmi_dev, conn_name);

	n = cec_notifier_get_conn(hdmi_dev, port_name);

	if (!n)

		return n;

include/media/cec-notifier.h

+8 −8
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ struct cec_notifier *cec_notifier_get_conn(struct device *dev, 
 * cec_notifier_conn_register - find or create a new cec_notifier for the given

 * HDMI device and connector tuple.

 * @hdmi_dev: HDMI device that sends the events.

 * @conn_name: the connector name from which the event occurs. May be NULL

 * @port_name: the connector name from which the event occurs. May be NULL

 * if there is always only one HDMI connector created by the HDMI device.

 * @conn_info: the connector info from which the event occurs (may be NULL)

 *

 * If a notifier for device @dev and connector @conn_name already exists, then

 * If a notifier for device @dev and connector @port_name already exists, then

 * increase the refcount and return that notifier.

 *

 * If it doesn't exist, then allocate a new notifier struct and return a
@@ -53,7 +53,7 @@ struct cec_notifier *cec_notifier_get_conn(struct device *dev, 
 * Return NULL if the memory could not be allocated.

 */

struct cec_notifier *

cec_notifier_conn_register(struct device *hdmi_dev, const char *conn_name,

cec_notifier_conn_register(struct device *hdmi_dev, const char *port_name,

			   const struct cec_connector_info *conn_info);



/**
@@ -67,11 +67,11 @@ void cec_notifier_conn_unregister(struct cec_notifier *n); 
 * cec_notifier_cec_adap_register - find or create a new cec_notifier for the

 * given device.

 * @hdmi_dev: HDMI device that sends the events.

 * @conn_name: the connector name from which the event occurs. May be NULL

 * @port_name: the connector name from which the event occurs. May be NULL

 * if there is always only one HDMI connector created by the HDMI device.

 * @adap: the cec adapter that registered this notifier.

 *

 * If a notifier for device @dev and connector @conn_name already exists, then

 * If a notifier for device @dev and connector @port_name already exists, then

 * increase the refcount and return that notifier.

 *

 * If it doesn't exist, then allocate a new notifier struct and return a
@@ -80,7 +80,7 @@ void cec_notifier_conn_unregister(struct cec_notifier *n); 
 * Return NULL if the memory could not be allocated.

 */

struct cec_notifier *

cec_notifier_cec_adap_register(struct device *hdmi_dev, const char *conn_name,

cec_notifier_cec_adap_register(struct device *hdmi_dev, const char *port_name,

			       struct cec_adapter *adap);



/**
@@ -133,7 +133,7 @@ static inline struct cec_notifier *cec_notifier_get_conn(struct device *dev, 
}



static inline struct cec_notifier *

cec_notifier_conn_register(struct device *hdmi_dev, const char *conn_name,

cec_notifier_conn_register(struct device *hdmi_dev, const char *port_name,

			   const struct cec_connector_info *conn_info)

{

	/* A non-NULL pointer is expected on success */
@@ -145,7 +145,7 @@ static inline void cec_notifier_conn_unregister(struct cec_notifier *n) 
}



static inline struct cec_notifier *

cec_notifier_cec_adap_register(struct device *hdmi_dev, const char *conn_name,

cec_notifier_cec_adap_register(struct device *hdmi_dev, const char *port_name,

			       struct cec_adapter *adap)

{

	/* A non-NULL pointer is expected on success */

CRA Git | Maintained and supported by SUSTech CRA and CCSE