Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ps3av: misc updates

Browse source 
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:
Geert Uytterhoeven 2007-05-02 14:48:35 +02:00 committed by Linus Torvalds
parent bd685ac8e7
commit fffe52e86b
2 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/ps3/ps3av.c
View file

@ -38,7 +38,24 @@
static int timeout = 5000; /* in msec ( 5 sec ) */ static int timeout = 5000; /* in msec ( 5 sec ) */
module_param(timeout, int, 0644); module_param(timeout, int, 0644);
static struct ps3av ps3av; static struct ps3av {
int available;
struct mutex mutex;
struct work_struct work;
struct completion done;
struct workqueue_struct *wq;
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;
} ps3av;
static struct ps3_vuart_port_device ps3av_dev = { static struct ps3_vuart_port_device ps3av_dev = {
.match_id = PS3_MATCH_ID_AV_SETTINGS .match_id = PS3_MATCH_ID_AV_SETTINGS
@ -250,7 +267,7 @@ int ps3av_do_pkt(u32 cid, u16 send_len, size_t usr_buf_size,
struct ps3av_send_hdr *buf) struct ps3av_send_hdr *buf)
{ {
int res = 0; int res = 0;
union { static union {
struct ps3av_reply_hdr reply_hdr; struct ps3av_reply_hdr reply_hdr;
u8 raw[PS3AV_BUF_SIZE]; u8 raw[PS3AV_BUF_SIZE];
} recv_buf; } recv_buf;
@ -259,8 +276,7 @@ int ps3av_do_pkt(u32 cid, u16 send_len, size_t usr_buf_size,
BUG_ON(!ps3av.available); BUG_ON(!ps3av.available);
if (down_interruptible(&ps3av.sem)) mutex_lock(&ps3av.mutex);
return -ERESTARTSYS;
table = ps3av_search_cmd_table(cid, PS3AV_CID_MASK); table = ps3av_search_cmd_table(cid, PS3AV_CID_MASK);
BUG_ON(!table); BUG_ON(!table);
@ -290,11 +306,11 @@ int ps3av_do_pkt(u32 cid, u16 send_len, size_t usr_buf_size,
goto err; goto err;
} }
up(&ps3av.sem); mutex_unlock(&ps3av.mutex);
return 0; return 0;
err: err:
up(&ps3av.sem); mutex_unlock(&ps3av.mutex);
printk(KERN_ERR "%s: failed cid:%x res:%d\n", __FUNCTION__, cid, res); printk(KERN_ERR "%s: failed cid:%x res:%d\n", __FUNCTION__, cid, res);
return res; return res;
} }
@ -872,7 +888,6 @@ static int ps3av_probe(struct ps3_vuart_port_device *dev)
memset(&ps3av, 0, sizeof(ps3av)); memset(&ps3av, 0, sizeof(ps3av));
init_MUTEX(&ps3av.sem);
mutex_init(&ps3av.mutex); mutex_init(&ps3av.mutex);
ps3av.ps3av_mode = 0; ps3av.ps3av_mode = 0;
ps3av.dev = dev; ps3av.dev = dev;

22
include/asm-powerpc/ps3av.h
View file

@ -18,8 +18,6 @@
#ifndef _ASM_POWERPC_PS3AV_H_ #ifndef _ASM_POWERPC_PS3AV_H_
#define _ASM_POWERPC_PS3AV_H_ #define _ASM_POWERPC_PS3AV_H_
#include <linux/mutex.h>
/** command for ioctl() **/ /** command for ioctl() **/
#define PS3AV_VERSION 0x205 /* version of ps3av command */ #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]; 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 **/ /** command status **/
#define PS3AV_STATUS_SUCCESS 0x0000 /* success */ #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 *, extern int ps3av_cmd_video_get_monitor_info(struct ps3av_pkt_av_get_monitor_info *,
u32); u32);
struct ps3_vuart_port_device;
extern int ps3av_vuart_write(struct ps3_vuart_port_device *dev, extern int ps3av_vuart_write(struct ps3_vuart_port_device *dev,
const void *buf, unsigned long size); const void *buf, unsigned long size);
extern int ps3av_vuart_read(struct ps3_vuart_port_device *dev, void *buf, extern int ps3av_vuart_read(struct ps3_vuart_port_device *dev, void *buf,