Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc749986 authored by Jean Pihet's avatar Jean Pihet Committed by Rafael J. Wysocki
Browse files

PM QoS: Minor clean-ups 



 - Misc fixes to improve code readability:
  * rename struct pm_qos_request_list to struct pm_qos_request,
  * rename pm_qos_req parameter to req in internal code,
    consistenly use req in the API parameters,
  * update the in-kernel API callers to the new parameters names,
  * rename of fields names (requests, list, node, constraints)

Signed-off-by: default avatarJean Pihet <j-pihet@ti.com>
Acked-by: default avatarmarkgross <markgross@thegnar.org>
Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent e8db0be1

drivers/media/video/via-camera.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ struct via_camera { 
	struct mutex lock;

	struct mutex lock;

	enum viacam_opstate opstate;

	enum viacam_opstate opstate;

	unsigned long flags;

	unsigned long flags;

	struct pm_qos_request_list qos_request;

	struct pm_qos_request qos_request;

	/*

	/*

	 * GPIO info for power/reset management

	 * GPIO info for power/reset management

	 */

	 */

drivers/net/wireless/ipw2x00/ipw2100.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -174,7 +174,7 @@ that only one external action is invoked at a time. 
#define DRV_DESCRIPTION	"Intel(R) PRO/Wireless 2100 Network Driver"

#define DRV_DESCRIPTION	"Intel(R) PRO/Wireless 2100 Network Driver"

#define DRV_COPYRIGHT	"Copyright(c) 2003-2006 Intel Corporation"

#define DRV_COPYRIGHT	"Copyright(c) 2003-2006 Intel Corporation"





static struct pm_qos_request_list ipw2100_pm_qos_req;

static struct pm_qos_request ipw2100_pm_qos_req;





/* Debugging stuff */

/* Debugging stuff */

#ifdef CONFIG_IPW2100_DEBUG

#ifdef CONFIG_IPW2100_DEBUG

include/linux/netdevice.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -964,7 +964,7 @@ struct net_device { 
	 */

	 */

	char			name[IFNAMSIZ];

	char			name[IFNAMSIZ];





	struct pm_qos_request_list pm_qos_req;

	struct pm_qos_request	pm_qos_req;





	/* device name hash chain */

	/* device name hash chain */

	struct hlist_node	name_hlist;

	struct hlist_node	name_hlist;

include/linux/pm_qos.h

+11 −11
Original line number Original line Diff line number Diff line
@@ -20,30 +20,30 @@ 
#define PM_QOS_NETWORK_LAT_DEFAULT_VALUE	(2000 * USEC_PER_SEC)

#define PM_QOS_NETWORK_LAT_DEFAULT_VALUE	(2000 * USEC_PER_SEC)

#define PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE	0

#define PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE	0





struct pm_qos_request_list {

struct pm_qos_request {

	struct plist_node list;

	struct plist_node node;

	int pm_qos_class;

	int pm_qos_class;

};

};





#ifdef CONFIG_PM

#ifdef CONFIG_PM

void pm_qos_add_request(struct pm_qos_request_list *l,

void pm_qos_add_request(struct pm_qos_request *req, int pm_qos_class,

			int pm_qos_class, s32 value);

			s32 value);

void pm_qos_update_request(struct pm_qos_request_list *pm_qos_req,

void pm_qos_update_request(struct pm_qos_request *req,

			   s32 new_value);

			   s32 new_value);

void pm_qos_remove_request(struct pm_qos_request_list *pm_qos_req);

void pm_qos_remove_request(struct pm_qos_request *req);





int pm_qos_request(int pm_qos_class);

int pm_qos_request(int pm_qos_class);

int pm_qos_add_notifier(int pm_qos_class, struct notifier_block *notifier);

int pm_qos_add_notifier(int pm_qos_class, struct notifier_block *notifier);

int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier);

int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier);

int pm_qos_request_active(struct pm_qos_request_list *req);

int pm_qos_request_active(struct pm_qos_request *req);

#else

#else

static inline void pm_qos_add_request(struct pm_qos_request_list *l,

static inline void pm_qos_add_request(struct pm_qos_request *req,

				      int pm_qos_class, s32 value)

				      int pm_qos_class, s32 value)

			{ return; }

			{ return; }

static inline void pm_qos_update_request(struct pm_qos_request_list *pm_qos_req,

static inline void pm_qos_update_request(struct pm_qos_request *req,

					 s32 new_value)

					 s32 new_value)

			{ return; }

			{ return; }

static inline void pm_qos_remove_request(struct pm_qos_request_list *pm_qos_req)

static inline void pm_qos_remove_request(struct pm_qos_request *req)

			{ return; }

			{ return; }





static inline int pm_qos_request(int pm_qos_class)

static inline int pm_qos_request(int pm_qos_class)
@@ -54,7 +54,7 @@ static inline int pm_qos_add_notifier(int pm_qos_class, 
static inline int pm_qos_remove_notifier(int pm_qos_class,

static inline int pm_qos_remove_notifier(int pm_qos_class,

					 struct notifier_block *notifier)

					 struct notifier_block *notifier)

			{ return 0; }

			{ return 0; }

static inline int pm_qos_request_active(struct pm_qos_request_list *req)

static inline int pm_qos_request_active(struct pm_qos_request *req)

			{ return 0; }

			{ return 0; }

#endif

#endif

include/sound/pcm.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -373,7 +373,7 @@ struct snd_pcm_substream { 
	int number;

	int number;

	char name[32];			/* substream name */

	char name[32];			/* substream name */

	int stream;			/* stream (direction) */

	int stream;			/* stream (direction) */

	struct pm_qos_request_list latency_pm_qos_req; /* pm_qos request */

	struct pm_qos_request latency_pm_qos_req; /* pm_qos request */

	size_t buffer_bytes_max;	/* limit ring buffer size */

	size_t buffer_bytes_max;	/* limit ring buffer size */

	struct snd_dma_buffer dma_buffer;

	struct snd_dma_buffer dma_buffer;

	unsigned int dma_buf_id;

	unsigned int dma_buf_id;