Commit e40242b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rpmsg-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc 

Pull rpmsg updates from Bjorn Andersson:
 "Fix two build issues in the GLINK driver and correct some kerneldoc in
  the same"

* tag 'rpmsg-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
  rpmsg: glink: add include of header file
  rpmsg: glink: Guard qcom_glink_ssr_notify() with correct config
  rpmsg: glink: fix some kerneldoc comments
parents 890caa39 3e35772b

drivers/rpmsg/qcom_glink_ssr.c

+9 −8
Original line number Diff line number Diff line
@@ -8,15 +8,16 @@ 
#include <linux/module.h>

#include <linux/notifier.h>

#include <linux/rpmsg.h>

#include <linux/rpmsg/qcom_glink.h>

#include <linux/remoteproc/qcom_rproc.h>



/**

 * struct do_cleanup_msg - The data structure for an SSR do_cleanup message

 * version:     The G-Link SSR protocol version

 * command:     The G-Link SSR command - do_cleanup

 * seq_num:     Sequence number

 * name_len:    Length of the name of the subsystem being restarted

 * name:        G-Link edge name of the subsystem being restarted

 * @version:	The G-Link SSR protocol version

 * @command:	The G-Link SSR command - do_cleanup

 * @seq_num:	Sequence number

 * @name_len:	Length of the name of the subsystem being restarted

 * @name:	G-Link edge name of the subsystem being restarted

 */

struct do_cleanup_msg {

	__le32 version;
@@ -28,9 +29,9 @@ struct do_cleanup_msg { 


/**

 * struct cleanup_done_msg - The data structure for an SSR cleanup_done message

 * version:     The G-Link SSR protocol version

 * response:    The G-Link SSR response to a do_cleanup command, cleanup_done

 * seq_num:     Sequence number

 * @version:	The G-Link SSR protocol version

 * @response:	The G-Link SSR response to a do_cleanup command, cleanup_done

 * @seq_num:	Sequence number

 */

struct cleanup_done_msg {

	__le32 version;

include/linux/rpmsg/qcom_glink.h

+6 −2
Original line number Diff line number Diff line
@@ -7,12 +7,17 @@ 


struct qcom_glink;



#if IS_ENABLED(CONFIG_RPMSG_QCOM_GLINK)

void qcom_glink_ssr_notify(const char *ssr_name);

#else

static inline void qcom_glink_ssr_notify(const char *ssr_name) {}

#endif



#if IS_ENABLED(CONFIG_RPMSG_QCOM_GLINK_SMEM)



struct qcom_glink *qcom_glink_smem_register(struct device *parent,

					    struct device_node *node);

void qcom_glink_smem_unregister(struct qcom_glink *glink);

void qcom_glink_ssr_notify(const char *ssr_name);



#else
@@ -24,7 +29,6 @@ qcom_glink_smem_register(struct device *parent, 
}



static inline void qcom_glink_smem_unregister(struct qcom_glink *glink) {}

static inline void qcom_glink_ssr_notify(const char *ssr_name) {}

#endif



#endif