ps3av: misc updates
ps3av:
- Move the definition of struct ps3av to ps3av.c, as it's locally used only.
- Kill ps3av.sem, use the existing ps3av.mutex instead.
- Make the 512-byte buffer in ps3av_do_pkt() static to reduce stack usage.
Its use is protected by a semaphore anyway.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
bd685ac8e7
commit
fffe52e86b
@@ -18,8 +18,6 @@
|
||||
#ifndef _ASM_POWERPC_PS3AV_H_
|
||||
#define _ASM_POWERPC_PS3AV_H_
|
||||
|
||||
#include <linux/mutex.h>
|
||||
|
||||
/** command for ioctl() **/
|
||||
#define PS3AV_VERSION 0x205 /* version of ps3av command */
|
||||
|
||||
@@ -643,25 +641,6 @@ struct ps3av_pkt_avb_param {
|
||||
u8 buf[PS3AV_PKT_AVB_PARAM_MAX_BUF_SIZE];
|
||||
};
|
||||
|
||||
struct ps3av {
|
||||
int available;
|
||||
struct semaphore sem;
|
||||
struct work_struct work;
|
||||
struct completion done;
|
||||
struct workqueue_struct *wq;
|
||||
struct mutex mutex;
|
||||
int open_count;
|
||||
struct ps3_vuart_port_device *dev;
|
||||
|
||||
int region;
|
||||
struct ps3av_pkt_av_get_hw_conf av_hw_conf;
|
||||
u32 av_port[PS3AV_AV_PORT_MAX + PS3AV_OPT_PORT_MAX];
|
||||
u32 opt_port[PS3AV_OPT_PORT_MAX];
|
||||
u32 head[PS3AV_HEAD_MAX];
|
||||
u32 audio_port;
|
||||
int ps3av_mode;
|
||||
int ps3av_mode_old;
|
||||
};
|
||||
|
||||
/** command status **/
|
||||
#define PS3AV_STATUS_SUCCESS 0x0000 /* success */
|
||||
@@ -719,6 +698,7 @@ static inline void ps3av_cmd_av_monitor_info_dump(const struct ps3av_pkt_av_get_
|
||||
extern int ps3av_cmd_video_get_monitor_info(struct ps3av_pkt_av_get_monitor_info *,
|
||||
u32);
|
||||
|
||||
struct ps3_vuart_port_device;
|
||||
extern int ps3av_vuart_write(struct ps3_vuart_port_device *dev,
|
||||
const void *buf, unsigned long size);
|
||||
extern int ps3av_vuart_read(struct ps3_vuart_port_device *dev, void *buf,
|
||||
|
||||
Reference in New Issue
Block a user