summaryrefslogtreecommitdiffstats
path: root/vidix/sysdep
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-16 00:13:03 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-16 00:13:03 +0000
commit3acba2c82d002736a5917ad412b34ee0416ba2ac (patch)
treeb30a0a98e033894544af0a328f6aff3b6d4f8e36 /vidix/sysdep
parent7c0eee9bce417dccfce072bce38e50a4321b96a9 (diff)
downloadmpv-3acba2c82d002736a5917ad412b34ee0416ba2ac.tar.bz2
mpv-3acba2c82d002736a5917ad412b34ee0416ba2ac.tar.xz
cosmetics: Remove useless parentheses from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26785 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix/sysdep')
-rw-r--r--vidix/sysdep/AsmMacros_arm32.h12
-rw-r--r--vidix/sysdep/AsmMacros_powerpc.h6
-rw-r--r--vidix/sysdep/pci_386bsd.c10
-rw-r--r--vidix/sysdep/pci_bsdi.c10
-rw-r--r--vidix/sysdep/pci_freebsd.c10
-rw-r--r--vidix/sysdep/pci_isc.c4
-rw-r--r--vidix/sysdep/pci_linux.c12
-rw-r--r--vidix/sysdep/pci_lynx.c2
-rw-r--r--vidix/sysdep/pci_mach386.c6
-rw-r--r--vidix/sysdep/pci_netbsd.c10
-rw-r--r--vidix/sysdep/pci_openbsd.c6
-rw-r--r--vidix/sysdep/pci_os2.c8
-rw-r--r--vidix/sysdep/pci_sco.c4
-rw-r--r--vidix/sysdep/pci_svr4.c4
-rw-r--r--vidix/sysdep/pci_win32.c6
15 files changed, 55 insertions, 55 deletions
diff --git a/vidix/sysdep/AsmMacros_arm32.h b/vidix/sysdep/AsmMacros_arm32.h
index 6fe0b66466..d7973cc48c 100644
--- a/vidix/sysdep/AsmMacros_arm32.h
+++ b/vidix/sysdep/AsmMacros_arm32.h
@@ -84,20 +84,20 @@ static __inline__ void outl(short port,int val)
static __inline__ unsigned int inb(short port)
{
- if ((unsigned short)port >= 0x400) return((unsigned int)-1);
- return(*(volatile unsigned char*)(((unsigned short)(port))+IOPortBase));
+ if ((unsigned short)port >= 0x400) return (unsigned int)-1;
+ return *(volatile unsigned char*)(((unsigned short)(port))+IOPortBase);
}
static __inline__ unsigned int inw(short port)
{
- if ((unsigned short)port >= 0x400) return((unsigned int)-1);
- return(*(volatile unsigned short*)(((unsigned short)(port))+IOPortBase));
+ if ((unsigned short)port >= 0x400) return (unsigned int)-1;
+ return *(volatile unsigned short*)(((unsigned short)(port))+IOPortBase);
}
static __inline__ unsigned int inl(short port)
{
- if ((unsigned short)port >= 0x400) return((unsigned int)-1);
- return(*(volatile unsigned long*)(((unsigned short)(port))+IOPortBase));
+ if ((unsigned short)port >= 0x400) return (unsigned int)-1;
+ return *(volatile unsigned long*)(((unsigned short)(port))+IOPortBase);
}
#define intr_disable()
diff --git a/vidix/sysdep/AsmMacros_powerpc.h b/vidix/sysdep/AsmMacros_powerpc.h
index 71ab4c6617..7120446afe 100644
--- a/vidix/sysdep/AsmMacros_powerpc.h
+++ b/vidix/sysdep/AsmMacros_powerpc.h
@@ -90,21 +90,21 @@ static __inline__ unsigned char inb(short port)
{
unsigned char val;
val = *((unsigned char *)(ioBase + port)); eieio();
- return(val);
+ return val;
}
static __inline__ unsigned short inw(short port)
{
unsigned short val;
val = *((unsigned short *)(ioBase + port)); eieio();
- return(val);
+ return val;
}
static __inline__ unsigned long inl(short port)
{
unsigned long val;
val = *((unsigned long *)(ioBase + port)); eieio();
- return(val);
+ return val;
}
#define intr_disable()
diff --git a/vidix/sysdep/pci_386bsd.c b/vidix/sysdep/pci_386bsd.c
index 76c9fad459..3f7dd0f755 100644
--- a/vidix/sysdep/pci_386bsd.c
+++ b/vidix/sysdep/pci_386bsd.c
@@ -40,13 +40,13 @@ static __inline__ int enable_os_io(void)
io_fd = -1 ;
if ((io_fd = open("/dev/console", O_RDWR, 0)) < 0) {
perror("/dev/console");
- return(errno);
+ return errno;
}
if (ioctl(io_fd, KDENABIO, 0) < 0) {
perror("ioctl(KDENABIO)");
- return(errno);
+ return errno;
}
- return(0);
+ return 0;
}
static __inline__ int disable_os_io(void)
@@ -54,8 +54,8 @@ static __inline__ int disable_os_io(void)
if (ioctl(io_fd, KDDISABIO, 0) < 0) {
perror("ioctl(KDDISABIO)");
close(io_fd);
- return(errno);
+ return errno;
}
close(io_fd);
- return(0);
+ return 0;
}
diff --git a/vidix/sysdep/pci_bsdi.c b/vidix/sysdep/pci_bsdi.c
index b6b142054d..982f725a9b 100644
--- a/vidix/sysdep/pci_bsdi.c
+++ b/vidix/sysdep/pci_bsdi.c
@@ -18,13 +18,13 @@ static __inline__ int enable_os_io(void)
io_fd = -1 ;
if ((io_fd = open("/dev/console", O_RDWR, 0)) < 0) {
perror("/dev/console");
- return(errno);
+ return errno;
}
if (ioctl(io_fd, PCCONENABIOPL, 0) < 0) {
perror("ioctl(PCCONENABIOPL)");
- return(errno);
+ return errno;
}
- return(0);
+ return 0;
}
static __inline__ int disable_os_io(void)
@@ -32,8 +32,8 @@ static __inline__ int disable_os_io(void)
if (ioctl(io_fd, PCCONDISABIOPL, 0) < 0) {
perror("ioctl(PCCONDISABIOPL)");
close(io_fd);
- return(errno);
+ return errno;
}
close(io_fd);
- return(0);
+ return 0;
}
diff --git a/vidix/sysdep/pci_freebsd.c b/vidix/sysdep/pci_freebsd.c
index 1820da2617..ee3525bc2f 100644
--- a/vidix/sysdep/pci_freebsd.c
+++ b/vidix/sysdep/pci_freebsd.c
@@ -40,13 +40,13 @@ static __inline__ int enable_os_io(void)
io_fd = -1 ;
if ((io_fd = open("/dev/console", O_RDWR, 0)) < 0) {
perror("/dev/console");
- return(errno);
+ return errno;
}
if (ioctl(io_fd, KDENABIO, 0) < 0) {
perror("ioctl(KDENABIO)");
- return(errno);
+ return errno;
}
- return(0);
+ return 0;
}
static __inline__ int disable_os_io(void)
@@ -54,8 +54,8 @@ static __inline__ int disable_os_io(void)
if (ioctl(io_fd, KDDISABIO, 0) < 0) {
perror("ioctl(KDDISABIO)");
close(io_fd);
- return(errno);
+ return errno;
}
close(io_fd);
- return(0);
+ return 0;
}
diff --git a/vidix/sysdep/pci_isc.c b/vidix/sysdep/pci_isc.c
index be2ed10556..17fb2b6106 100644
--- a/vidix/sysdep/pci_isc.c
+++ b/vidix/sysdep/pci_isc.c
@@ -41,7 +41,7 @@ static __inline__ int enable_os_io(void)
#else
sysi86(SI86V86, V86SC_IOPL, PS_IOPL);
#endif
- return(0);
+ return 0;
}
static __inline__ int disable_os_io(void)
@@ -51,5 +51,5 @@ static __inline__ int disable_os_io(void)
#else
sysi86(SI86V86, V86SC_IOPL, 0);
#endif
- return(0);
+ return 0;
}
diff --git a/vidix/sysdep/pci_linux.c b/vidix/sysdep/pci_linux.c
index 5e46f89fe9..07d9566563 100644
--- a/vidix/sysdep/pci_linux.c
+++ b/vidix/sysdep/pci_linux.c
@@ -96,7 +96,7 @@ static __inline__ int enable_os_io(void)
if (svgahelper_fd > 0)
{
svgahelper_initialized = 1;
- return(0);
+ return 0;
}
svgahelper_initialized = -1;
#endif
@@ -106,7 +106,7 @@ static __inline__ int enable_os_io(void)
if (dhahelper_fd > 0)
{
dhahelper_initialized = 1;
- return(0);
+ return 0;
}
dhahelper_initialized = -1;
#endif
@@ -115,9 +115,9 @@ static __inline__ int enable_os_io(void)
/* should be fixed? */
#else
if (iopl(3) != 0)
- return(errno);
+ return errno;
#endif
- return(0);
+ return 0;
}
static __inline__ int disable_os_io(void)
@@ -136,9 +136,9 @@ static __inline__ int disable_os_io(void)
/* should be fixed? */
#else
if (iopl(0) != 0)
- return(errno);
+ return errno;
#endif
- return(0);
+ return 0;
}
#if (defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) \
diff --git a/vidix/sysdep/pci_lynx.c b/vidix/sysdep/pci_lynx.c
index ce2ee0273b..59b8dddb2c 100644
--- a/vidix/sysdep/pci_lynx.c
+++ b/vidix/sysdep/pci_lynx.c
@@ -61,7 +61,7 @@ static __inline__ unsigned long
static swapl(unsigned long val)
{
unsigned char *p = (unsigned char *)&val;
- return ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | (p[0] << 0));
+ return (p[3] << 24) | (p[2] << 16) | (p[1] << 8) | (p[0] << 0);
}
diff --git a/vidix/sysdep/pci_mach386.c b/vidix/sysdep/pci_mach386.c
index d0096faaa6..3445a11f7f 100644
--- a/vidix/sysdep/pci_mach386.c
+++ b/vidix/sysdep/pci_mach386.c
@@ -35,13 +35,13 @@ static __inline__ int enable_os_io(void)
io_fd = -1 ;
if ((io_fd = open("/dev/iopl", O_RDWR, 0)) < 0) {
perror("/dev/iopl");
- return(errno);
+ return errno;
}
- return(0);
+ return 0;
}
static __inline__ int disable_os_io(void)
{
close(io_fd);
- return(0);
+ return 0;
}
diff --git a/vidix/sysdep/pci_netbsd.c b/vidix/sysdep/pci_netbsd.c
index 3fcaad0d5b..fa8f735e87 100644
--- a/vidix/sysdep/pci_netbsd.c
+++ b/vidix/sysdep/pci_netbsd.c
@@ -42,15 +42,15 @@ static __inline__ int enable_os_io(void)
#if !defined(USE_I386_IOPL)
if ((io_fd = open("/dev/io", O_RDWR, 0)) < 0) {
perror("/dev/io");
- return(errno);
+ return errno;
}
#else
if (i386_iopl(1) < 0) {
perror("i386_iopl");
- return(errno);
+ return errno;
}
#endif /* USE_I386_IOPL */
- return(0);
+ return 0;
}
static __inline__ int disable_os_io(void)
@@ -60,8 +60,8 @@ static __inline__ int disable_os_io(void)
#else
if (i386_iopl(0) < 0) {
perror("i386_iopl");
- return(errno);
+ return errno;
}
#endif /* NetBSD1_1 */
- return(0);
+ return 0;
}
diff --git a/vidix/sysdep/pci_openbsd.c b/vidix/sysdep/pci_openbsd.c
index 029c1e835a..5daef9ff21 100644
--- a/vidix/sysdep/pci_openbsd.c
+++ b/vidix/sysdep/pci_openbsd.c
@@ -36,14 +36,14 @@ static __inline__ int enable_os_io(void)
{
if (i386_iopl(1) < 0) {
perror("i386_iopl");
- return(errno);
+ return errno;
}
- return(0);
+ return 0;
}
static __inline__ int disable_os_io(void)
{
/* Nothing to do */
- return(0);
+ return 0;
}
#endif
diff --git a/vidix/sysdep/pci_os2.c b/vidix/sysdep/pci_os2.c
index 09227fa573..002494f682 100644
--- a/vidix/sysdep/pci_os2.c
+++ b/vidix/sysdep/pci_os2.c
@@ -44,7 +44,7 @@ static __inline__ int enable_os_io(void)
(ULONG)0) != 0) {
fprintf(stderr,"Error opening fastio$ driver...\n");
fprintf(stderr,"Please install xf86sup.sys in config.sys!\n");
- return(42);
+ return 42;
}
callgate[0] = callgate[1] = 0;
@@ -57,7 +57,7 @@ static __inline__ int enable_os_io(void)
fprintf(stderr,"xf86-OS/2: EnableIOPorts failed, rc=%d, dlen=%d; emergency exit\n",
rc,dlen);
DosClose(hfd);
- return(42);
+ return 42;
}
/* Calling callgate with function 13 sets IOPL for the program */
@@ -68,11 +68,11 @@ static __inline__ int enable_os_io(void)
: "eax","ebx","ecx","edx","cc");
DosClose(hfd);
- return(0);
+ return 0;
}
static __inline__ int disable_os_io(void)
{
/* Nothing to do */
- return(0);
+ return 0;
}
diff --git a/vidix/sysdep/pci_sco.c b/vidix/sysdep/pci_sco.c
index 83a21c1614..b8505e09f0 100644
--- a/vidix/sysdep/pci_sco.c
+++ b/vidix/sysdep/pci_sco.c
@@ -42,7 +42,7 @@ static __inline__ int enable_os_io(void)
#else
sysi86(SI86V86, V86SC_IOPL, PS_IOPL);
#endif
- return(0);
+ return 0;
}
static __inline__ int disable_os_io(void)
@@ -52,5 +52,5 @@ static __inline__ int disable_os_io(void)
#else
sysi86(SI86V86, V86SC_IOPL, 0);
#endif
- return(0);
+ return 0;
}
diff --git a/vidix/sysdep/pci_svr4.c b/vidix/sysdep/pci_svr4.c
index acf1136c20..ecefd3befd 100644
--- a/vidix/sysdep/pci_svr4.c
+++ b/vidix/sysdep/pci_svr4.c
@@ -51,7 +51,7 @@ static __inline__ int enable_os_io(void)
#else
sysi86(SI86V86, V86SC_IOPL, PS_IOPL);
#endif
- return(0);
+ return 0;
}
static __inline__ int disable_os_io(void)
@@ -61,5 +61,5 @@ static __inline__ int disable_os_io(void)
#else
sysi86(SI86V86, V86SC_IOPL, 0);
#endif
- return(0);
+ return 0;
}
diff --git a/vidix/sysdep/pci_win32.c b/vidix/sysdep/pci_win32.c
index 4821354d14..a838a74342 100644
--- a/vidix/sysdep/pci_win32.c
+++ b/vidix/sysdep/pci_win32.c
@@ -44,10 +44,10 @@ static __inline__ int enable_os_io(void)
hDriver = CreateFile("\\\\.\\DHAHELPER",GENERIC_READ | GENERIC_WRITE,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
if(!DeviceIoControl(hDriver, IOCTL_DHAHELPER_ENABLEDIRECTIO, NULL,0, NULL, 0, &dwBytesReturned, NULL)){
fprintf(stderr,"Unable to enable directio please install dhahelper.sys.\n");
- return(1);
+ return 1;
}
}
- return(0);
+ return 0;
}
static __inline__ int disable_os_io(void)
@@ -57,5 +57,5 @@ static __inline__ int disable_os_io(void)
DeviceIoControl(hDriver, IOCTL_DHAHELPER_DISABLEDIRECTIO, NULL,0, NULL, 0, &dwBytesReturned, NULL);
CloseHandle(hDriver);
}
- return(0);
+ return 0;
}