Commit 8082d0a3 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: cec-notifier: make cec_notifier_get_conn() static 



This function is no longer used by other drivers, so it can be
made static.

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

drivers/media/cec/cec-notifier.c

+15 −2
Original line number Diff line number Diff line
@@ -32,7 +32,21 @@ struct cec_notifier { 
static LIST_HEAD(cec_notifiers);

static DEFINE_MUTEX(cec_notifiers_lock);



struct cec_notifier *

/**

 * cec_notifier_get_conn - find or create a new cec_notifier for the given

 * device and connector tuple.

 * @hdmi_dev: device that sends the events.

 * @port_name: the connector name from which the event occurs

 *

 * If a notifier for device @dev already exists, then increase the refcount

 * and return that notifier.

 *

 * If it doesn't exist, then allocate a new notifier struct and return a

 * pointer to that new struct.

 *

 * Return NULL if the memory could not be allocated.

 */

static struct cec_notifier *

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

{

	struct cec_notifier *n;
@@ -68,7 +82,6 @@ cec_notifier_get_conn(struct device *hdmi_dev, const char *port_name) 
	mutex_unlock(&cec_notifiers_lock);

	return n;

}

EXPORT_SYMBOL_GPL(cec_notifier_get_conn);



static void cec_notifier_release(struct kref *kref)

{

include/media/cec-notifier.h

+0 −23
Original line number Diff line number Diff line
@@ -19,23 +19,6 @@ struct cec_notifier; 


#if IS_REACHABLE(CONFIG_CEC_CORE) && IS_ENABLED(CONFIG_CEC_NOTIFIER)



/**

 * cec_notifier_get_conn - find or create a new cec_notifier for the given

 * device and connector tuple.

 * @dev: device that sends the events.

 * @conn: the connector name from which the event occurs

 *

 * If a notifier for device @dev already exists, then increase the refcount

 * and return that notifier.

 *

 * If it doesn't exist, then allocate a new notifier struct and return a

 * pointer to that new struct.

 *

 * Return NULL if the memory could not be allocated.

 */

struct cec_notifier *cec_notifier_get_conn(struct device *dev,

					   const char *conn);



/**

 * cec_notifier_conn_register - find or create a new cec_notifier for the given

 * HDMI device and connector tuple.
@@ -125,12 +108,6 @@ void cec_notifier_set_phys_addr_from_edid(struct cec_notifier *n, 
struct device *cec_notifier_parse_hdmi_phandle(struct device *dev);



#else

static inline struct cec_notifier *cec_notifier_get_conn(struct device *dev,

							 const char *conn)

{

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

	return (struct cec_notifier *)0xdeadfeed;

}



static inline struct cec_notifier *

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