Skip to content

L
linux
Commit ee96aa8b authored by Stelian Pop's avatar Stelian Pop Committed by Linus Torvalds
Browse files
Options

[PATCH] sonypi: whitespace and coding style fixes 

Signed-off-by: default avatarStelian Pop <stelian@popies.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 39810387
Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 147 deletions
drivers/char/sonypi.c
View file @ ee96aa8b
/* /*
* Sony Programmable I/O Control Device driver for VAIO * Sony Programmable I/O Control Device driver for VAIO
* *
* Copyright (C) 2001-2003 Stelian Pop <stelian@popies.net> * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net>
* *
* Copyright (C) 2001-2002 Alcve <www.alcove.com> * Copyright (C) 2001-2002 Alcve <www.alcove.com>
* *
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
...@@ -125,7 +125,8 @@ static int sonypi_ec_read(u8 addr, u8 *value) ...@@ -125,7 +125,8 @@ static int sonypi_ec_read(u8 addr, u8 *value)
return 0; return 0;
} }
static int ec_read16(u8 addr, u16 *value) { static int ec_read16(u8 addr, u16 *value)
{
u8 val_lb, val_hb; u8 val_lb, val_hb;
if (sonypi_ec_read(addr, &val_lb)) if (sonypi_ec_read(addr, &val_lb))
return -1; return -1;
...@@ -136,21 +137,22 @@ static int ec_read16(u8 addr, u16 *value) { ...@@ -136,21 +137,22 @@ static int ec_read16(u8 addr, u16 *value) {
} }
/* Initializes the device - this comes from the AML code in the ACPI bios */ /* Initializes the device - this comes from the AML code in the ACPI bios */
static void sonypi_type1_srs(void) { static void sonypi_type1_srs(void)
{
u32 v; u32 v;
pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v); pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v);
v = (v & 0xFFFF0000) | ((u32)sonypi_device.ioport1); v = (v & 0xFFFF0000) | ((u32) sonypi_device.ioport1);
pci_write_config_dword(sonypi_device.dev, SONYPI_G10A, v); pci_write_config_dword(sonypi_device.dev, SONYPI_G10A, v);
pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v); pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v);
v = (v & 0xFFF0FFFF) | v = (v & 0xFFF0FFFF) |
(((u32)sonypi_device.ioport1 ^ sonypi_device.ioport2) << 16); (((u32) sonypi_device.ioport1 ^ sonypi_device.ioport2) << 16);
pci_write_config_dword(sonypi_device.dev, SONYPI_G10A, v); pci_write_config_dword(sonypi_device.dev, SONYPI_G10A, v);
v = inl(SONYPI_IRQ_PORT); v = inl(SONYPI_IRQ_PORT);
v &= ~(((u32)0x3) << SONYPI_IRQ_SHIFT); v &= ~(((u32) 0x3) << SONYPI_IRQ_SHIFT);
v |= (((u32)sonypi_device.bits) << SONYPI_IRQ_SHIFT); v |= (((u32) sonypi_device.bits) << SONYPI_IRQ_SHIFT);
outl(v, SONYPI_IRQ_PORT); outl(v, SONYPI_IRQ_PORT);
pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v); pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v);
...@@ -158,18 +160,20 @@ static void sonypi_type1_srs(void) { ...@@ -158,18 +160,20 @@ static void sonypi_type1_srs(void) {
pci_write_config_dword(sonypi_device.dev, SONYPI_G10A, v); pci_write_config_dword(sonypi_device.dev, SONYPI_G10A, v);
} }
static void sonypi_type2_srs(void) { static void sonypi_type2_srs(void)
{
if (sonypi_ec_write(SONYPI_SHIB, (sonypi_device.ioport1 & 0xFF00) >> 8)) if (sonypi_ec_write(SONYPI_SHIB, (sonypi_device.ioport1 & 0xFF00) >> 8))
printk(KERN_WARNING "ec_write failed\n"); printk(KERN_WARNING "ec_write failed\n");
if (sonypi_ec_write(SONYPI_SLOB, sonypi_device.ioport1 & 0x00FF)) if (sonypi_ec_write(SONYPI_SLOB, sonypi_device.ioport1 & 0x00FF))
printk(KERN_WARNING "ec_write failed\n"); printk(KERN_WARNING "ec_write failed\n");
if (sonypi_ec_write(SONYPI_SIRQ, sonypi_device.bits)) if (sonypi_ec_write(SONYPI_SIRQ, sonypi_device.bits))
printk(KERN_WARNING "ec_write failed\n"); printk(KERN_WARNING "ec_write failed\n");
udelay(10); udelay(10);
} }
/* Disables the device - this comes from the AML code in the ACPI bios */ /* Disables the device - this comes from the AML code in the ACPI bios */
static void sonypi_type1_dis(void) { static void sonypi_type1_dis(void)
{
u32 v; u32 v;
pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v); pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v);
...@@ -181,7 +185,8 @@ static void sonypi_type1_dis(void) { ...@@ -181,7 +185,8 @@ static void sonypi_type1_dis(void) {
outl(v, SONYPI_IRQ_PORT); outl(v, SONYPI_IRQ_PORT);
} }
static void sonypi_type2_dis(void) { static void sonypi_type2_dis(void)
{
if (sonypi_ec_write(SONYPI_SHIB, 0)) if (sonypi_ec_write(SONYPI_SHIB, 0))
printk(KERN_WARNING "ec_write failed\n"); printk(KERN_WARNING "ec_write failed\n");
if (sonypi_ec_write(SONYPI_SLOB, 0)) if (sonypi_ec_write(SONYPI_SLOB, 0))
...@@ -190,7 +195,8 @@ static void sonypi_type2_dis(void) { ...@@ -190,7 +195,8 @@ static void sonypi_type2_dis(void) {
printk(KERN_WARNING "ec_write failed\n"); printk(KERN_WARNING "ec_write failed\n");
} }
static u8 sonypi_call1(u8 dev) { static u8 sonypi_call1(u8 dev)
{
u8 v1, v2; u8 v1, v2;
wait_on_command(0, inb_p(sonypi_device.ioport2) & 2, ITERATIONS_LONG); wait_on_command(0, inb_p(sonypi_device.ioport2) & 2, ITERATIONS_LONG);
...@@ -200,7 +206,8 @@ static u8 sonypi_call1(u8 dev) { ...@@ -200,7 +206,8 @@ static u8 sonypi_call1(u8 dev) {
return v2; return v2;
} }
static u8 sonypi_call2(u8 dev, u8 fn) { static u8 sonypi_call2(u8 dev, u8 fn)
{
u8 v1; u8 v1;
wait_on_command(0, inb_p(sonypi_device.ioport2) & 2, ITERATIONS_LONG); wait_on_command(0, inb_p(sonypi_device.ioport2) & 2, ITERATIONS_LONG);
...@@ -211,7 +218,8 @@ static u8 sonypi_call2(u8 dev, u8 fn) { ...@@ -211,7 +218,8 @@ static u8 sonypi_call2(u8 dev, u8 fn) {
return v1; return v1;
} }
static u8 sonypi_call3(u8 dev, u8 fn, u8 v) { static u8 sonypi_call3(u8 dev, u8 fn, u8 v)
{
u8 v1; u8 v1;
wait_on_command(0, inb_p(sonypi_device.ioport2) & 2, ITERATIONS_LONG); wait_on_command(0, inb_p(sonypi_device.ioport2) & 2, ITERATIONS_LONG);
...@@ -224,7 +232,8 @@ static u8 sonypi_call3(u8 dev, u8 fn, u8 v) { ...@@ -224,7 +232,8 @@ static u8 sonypi_call3(u8 dev, u8 fn, u8 v) {
return v1; return v1;
} }
static u8 sonypi_read(u8 fn) { static u8 sonypi_read(u8 fn)
{
u8 v1, v2; u8 v1, v2;
int n = 100; int n = 100;
...@@ -238,13 +247,14 @@ static u8 sonypi_read(u8 fn) { ...@@ -238,13 +247,14 @@ static u8 sonypi_read(u8 fn) {
} }
/* Set brightness, hue etc */ /* Set brightness, hue etc */
static void sonypi_set(u8 fn, u8 v) { static void sonypi_set(u8 fn, u8 v)
{
wait_on_command(0, sonypi_call3(0x90, fn, v), ITERATIONS_SHORT); wait_on_command(0, sonypi_call3(0x90, fn, v), ITERATIONS_SHORT);
} }
/* Tests if the camera is ready */ /* Tests if the camera is ready */
static int sonypi_camera_ready(void) { static int sonypi_camera_ready(void)
{
u8 v; u8 v;
v = sonypi_call2(0x8f, SONYPI_CAMERA_STATUS); v = sonypi_call2(0x8f, SONYPI_CAMERA_STATUS);
...@@ -252,19 +262,20 @@ static int sonypi_camera_ready(void) { ...@@ -252,19 +262,20 @@ static int sonypi_camera_ready(void) {
} }
/* Turns the camera off */ /* Turns the camera off */
static void sonypi_camera_off(void) { static void sonypi_camera_off(void)
{
sonypi_set(SONYPI_CAMERA_PICTURE, SONYPI_CAMERA_MUTE_MASK); sonypi_set(SONYPI_CAMERA_PICTURE, SONYPI_CAMERA_MUTE_MASK);
if (!sonypi_device.camera_power) if (!sonypi_device.camera_power)
return; return;
sonypi_call2(0x91, 0); sonypi_call2(0x91, 0);
sonypi_device.camera_power = 0; sonypi_device.camera_power = 0;
} }
/* Turns the camera on */ /* Turns the camera on */
static void sonypi_camera_on(void) { static void sonypi_camera_on(void)
{
int i, j; int i, j;
if (sonypi_device.camera_power) if (sonypi_device.camera_power)
...@@ -287,7 +298,7 @@ static void sonypi_camera_on(void) { ...@@ -287,7 +298,7 @@ static void sonypi_camera_on(void) {
if (i) if (i)
break; break;
} }
if (j == 0) { if (j == 0) {
printk(KERN_WARNING "sonypi: failed to power on camera\n"); printk(KERN_WARNING "sonypi: failed to power on camera\n");
return; return;
...@@ -298,12 +309,13 @@ static void sonypi_camera_on(void) { ...@@ -298,12 +309,13 @@ static void sonypi_camera_on(void) {
} }
/* sets the bluetooth subsystem power state */ /* sets the bluetooth subsystem power state */
static void sonypi_setbluetoothpower(u8 state) { static void sonypi_setbluetoothpower(u8 state)
{
state = !!state; state = !!state;
if (sonypi_device.bluetooth_power == state)
if (sonypi_device.bluetooth_power == state)
return; return;
sonypi_call2(0x96, state); sonypi_call2(0x96, state);
sonypi_call1(0x82); sonypi_call1(0x82);
sonypi_device.bluetooth_power = state; sonypi_device.bluetooth_power = state;
...@@ -331,7 +343,8 @@ static void input_keyrelease(void *data) ...@@ -331,7 +343,8 @@ static void input_keyrelease(void *data)
} }
/* Interrupt handler: some event is available */ /* Interrupt handler: some event is available */
static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) { static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs)
{
u8 v1, v2, event = 0; u8 v1, v2, event = 0;
int i, j; int i, j;
...@@ -341,9 +354,10 @@ static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) { ...@@ -341,9 +354,10 @@ static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) {
for (i = 0; sonypi_eventtypes[i].model; i++) { for (i = 0; sonypi_eventtypes[i].model; i++) {
if (sonypi_device.model != sonypi_eventtypes[i].model) if (sonypi_device.model != sonypi_eventtypes[i].model)
continue; continue;
if ((v2 & sonypi_eventtypes[i].data) != sonypi_eventtypes[i].data) if ((v2 & sonypi_eventtypes[i].data) !=
sonypi_eventtypes[i].data)
continue; continue;
if (! (mask & sonypi_eventtypes[i].mask)) if (!(mask & sonypi_eventtypes[i].mask))
continue; continue;
for (j = 0; sonypi_eventtypes[i].events[j].event; j++) { for (j = 0; sonypi_eventtypes[i].events[j].event; j++) {
if (v1 == sonypi_eventtypes[i].events[j].data) { if (v1 == sonypi_eventtypes[i].events[j].data) {
...@@ -354,16 +368,17 @@ static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) { ...@@ -354,16 +368,17 @@ static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) {
} }
if (verbose) if (verbose)
printk(KERN_WARNING printk(KERN_WARNING
"sonypi: unknown event port1=0x%02x,port2=0x%02x\n",v1,v2); "sonypi: unknown event port1=0x%02x,port2=0x%02x\n",
v1, v2);
/* We need to return IRQ_HANDLED here because there *are* /* We need to return IRQ_HANDLED here because there *are*
* events belonging to the sonypi device we don't know about, * events belonging to the sonypi device we don't know about,
* but we still don't want those to pollute the logs... */ * but we still don't want those to pollute the logs... */
return IRQ_HANDLED; return IRQ_HANDLED;
found: found:
if (verbose > 1) if (verbose > 1)
printk(KERN_INFO printk(KERN_INFO
"sonypi: event port1=0x%02x,port2=0x%02x\n", v1, v2); "sonypi: event port1=0x%02x,port2=0x%02x\n", v1, v2);
if (useinput) { if (useinput) {
...@@ -420,7 +435,8 @@ static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) { ...@@ -420,7 +435,8 @@ static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) {
} }
/* External camera command (exported to the motion eye v4l driver) */ /* External camera command (exported to the motion eye v4l driver) */
u8 sonypi_camera_command(int command, u8 value) { u8 sonypi_camera_command(int command, u8 value)
{
u8 ret = 0; u8 ret = 0;
if (!camera) if (!camera)
...@@ -428,68 +444,68 @@ u8 sonypi_camera_command(int command, u8 value) { ...@@ -428,68 +444,68 @@ u8 sonypi_camera_command(int command, u8 value) {
down(&sonypi_device.lock); down(&sonypi_device.lock);
switch(command) { switch (command) {
case SONYPI_COMMAND_GETCAMERA: case SONYPI_COMMAND_GETCAMERA:
ret = sonypi_camera_ready(); ret = sonypi_camera_ready();
break; break;
case SONYPI_COMMAND_SETCAMERA: case SONYPI_COMMAND_SETCAMERA:
if (value) if (value)
sonypi_camera_on(); sonypi_camera_on();
else else
sonypi_camera_off(); sonypi_camera_off();
break; break;
case SONYPI_COMMAND_GETCAMERABRIGHTNESS: case SONYPI_COMMAND_GETCAMERABRIGHTNESS:
ret = sonypi_read(SONYPI_CAMERA_BRIGHTNESS); ret = sonypi_read(SONYPI_CAMERA_BRIGHTNESS);
break; break;
case SONYPI_COMMAND_SETCAMERABRIGHTNESS: case SONYPI_COMMAND_SETCAMERABRIGHTNESS:
sonypi_set(SONYPI_CAMERA_BRIGHTNESS, value); sonypi_set(SONYPI_CAMERA_BRIGHTNESS, value);
break; break;
case SONYPI_COMMAND_GETCAMERACONTRAST: case SONYPI_COMMAND_GETCAMERACONTRAST:
ret = sonypi_read(SONYPI_CAMERA_CONTRAST); ret = sonypi_read(SONYPI_CAMERA_CONTRAST);
break; break;
case SONYPI_COMMAND_SETCAMERACONTRAST: case SONYPI_COMMAND_SETCAMERACONTRAST:
sonypi_set(SONYPI_CAMERA_CONTRAST, value); sonypi_set(SONYPI_CAMERA_CONTRAST, value);
break; break;
case SONYPI_COMMAND_GETCAMERAHUE: case SONYPI_COMMAND_GETCAMERAHUE:
ret = sonypi_read(SONYPI_CAMERA_HUE); ret = sonypi_read(SONYPI_CAMERA_HUE);
break; break;
case SONYPI_COMMAND_SETCAMERAHUE: case SONYPI_COMMAND_SETCAMERAHUE:
sonypi_set(SONYPI_CAMERA_HUE, value); sonypi_set(SONYPI_CAMERA_HUE, value);
break; break;
case SONYPI_COMMAND_GETCAMERACOLOR: case SONYPI_COMMAND_GETCAMERACOLOR:
ret = sonypi_read(SONYPI_CAMERA_COLOR); ret = sonypi_read(SONYPI_CAMERA_COLOR);
break; break;
case SONYPI_COMMAND_SETCAMERACOLOR: case SONYPI_COMMAND_SETCAMERACOLOR:
sonypi_set(SONYPI_CAMERA_COLOR, value); sonypi_set(SONYPI_CAMERA_COLOR, value);
break; break;
case SONYPI_COMMAND_GETCAMERASHARPNESS: case SONYPI_COMMAND_GETCAMERASHARPNESS:
ret = sonypi_read(SONYPI_CAMERA_SHARPNESS); ret = sonypi_read(SONYPI_CAMERA_SHARPNESS);
break; break;
case SONYPI_COMMAND_SETCAMERASHARPNESS: case SONYPI_COMMAND_SETCAMERASHARPNESS:
sonypi_set(SONYPI_CAMERA_SHARPNESS, value); sonypi_set(SONYPI_CAMERA_SHARPNESS, value);
break; break;
case SONYPI_COMMAND_GETCAMERAPICTURE: case SONYPI_COMMAND_GETCAMERAPICTURE:
ret = sonypi_read(SONYPI_CAMERA_PICTURE); ret = sonypi_read(SONYPI_CAMERA_PICTURE);
break; break;
case SONYPI_COMMAND_SETCAMERAPICTURE: case SONYPI_COMMAND_SETCAMERAPICTURE:
sonypi_set(SONYPI_CAMERA_PICTURE, value); sonypi_set(SONYPI_CAMERA_PICTURE, value);
break; break;
case SONYPI_COMMAND_GETCAMERAAGC: case SONYPI_COMMAND_GETCAMERAAGC:
ret = sonypi_read(SONYPI_CAMERA_AGC); ret = sonypi_read(SONYPI_CAMERA_AGC);
break; break;
case SONYPI_COMMAND_SETCAMERAAGC: case SONYPI_COMMAND_SETCAMERAAGC:
sonypi_set(SONYPI_CAMERA_AGC, value); sonypi_set(SONYPI_CAMERA_AGC, value);
break; break;
case SONYPI_COMMAND_GETCAMERADIRECTION: case SONYPI_COMMAND_GETCAMERADIRECTION:
ret = sonypi_read(SONYPI_CAMERA_STATUS); ret = sonypi_read(SONYPI_CAMERA_STATUS);
ret &= SONYPI_DIRECTION_BACKWARDS; ret &= SONYPI_DIRECTION_BACKWARDS;
break; break;
case SONYPI_COMMAND_GETCAMERAROMVERSION: case SONYPI_COMMAND_GETCAMERAROMVERSION:
ret = sonypi_read(SONYPI_CAMERA_ROMVERSION); ret = sonypi_read(SONYPI_CAMERA_ROMVERSION);
break; break;
case SONYPI_COMMAND_GETCAMERAREVISION: case SONYPI_COMMAND_GETCAMERAREVISION:
ret = sonypi_read(SONYPI_CAMERA_REVISION); ret = sonypi_read(SONYPI_CAMERA_REVISION);
break; break;
} }
up(&sonypi_device.lock); up(&sonypi_device.lock);
return ret; return ret;
...@@ -497,7 +513,8 @@ u8 sonypi_camera_command(int command, u8 value) { ...@@ -497,7 +513,8 @@ u8 sonypi_camera_command(int command, u8 value) {
EXPORT_SYMBOL(sonypi_camera_command); EXPORT_SYMBOL(sonypi_camera_command);
static int sonypi_misc_fasync(int fd, struct file *filp, int on) { static int sonypi_misc_fasync(int fd, struct file *filp, int on)
{
int retval; int retval;
retval = fasync_helper(fd, filp, on, &sonypi_device.fifo_async); retval = fasync_helper(fd, filp, on, &sonypi_device.fifo_async);
...@@ -506,7 +523,8 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on) { ...@@ -506,7 +523,8 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on) {
return 0; return 0;
} }
static int sonypi_misc_release(struct inode * inode, struct file * file) { static int sonypi_misc_release(struct inode *inode, struct file *file)
{
sonypi_misc_fasync(-1, file, 0); sonypi_misc_fasync(-1, file, 0);
down(&sonypi_device.lock); down(&sonypi_device.lock);
sonypi_device.open_count--; sonypi_device.open_count--;
...@@ -514,7 +532,8 @@ static int sonypi_misc_release(struct inode * inode, struct file * file) { ...@@ -514,7 +532,8 @@ static int sonypi_misc_release(struct inode * inode, struct file * file) {
return 0; return 0;
} }
static int sonypi_misc_open(struct inode * inode, struct file * file) { static int sonypi_misc_open(struct inode *inode, struct file *file)
{
down(&sonypi_device.lock); down(&sonypi_device.lock);
/* Flush input queue on first open */ /* Flush input queue on first open */
if (!sonypi_device.open_count) if (!sonypi_device.open_count)
...@@ -524,8 +543,8 @@ static int sonypi_misc_open(struct inode * inode, struct file * file) { ...@@ -524,8 +543,8 @@ static int sonypi_misc_open(struct inode * inode, struct file * file) {
return 0; return 0;
} }
static ssize_t sonypi_misc_read(struct file * file, char __user * buf, static ssize_t sonypi_misc_read(struct file *file, char __user *buf,
size_t count, loff_t *pos) size_t count, loff_t *pos)
{ {
ssize_t ret; ssize_t ret;
unsigned char c; unsigned char c;
...@@ -552,15 +571,17 @@ static ssize_t sonypi_misc_read(struct file * file, char __user * buf, ...@@ -552,15 +571,17 @@ static ssize_t sonypi_misc_read(struct file * file, char __user * buf,
return ret; return ret;
} }
static unsigned int sonypi_misc_poll(struct file *file, poll_table * wait) { static unsigned int sonypi_misc_poll(struct file *file, poll_table *wait)
{
poll_wait(file, &sonypi_device.fifo_proc_list, wait); poll_wait(file, &sonypi_device.fifo_proc_list, wait);
if (kfifo_len(sonypi_device.fifo)) if (kfifo_len(sonypi_device.fifo))
return POLLIN | POLLRDNORM; return POLLIN | POLLRDNORM;
return 0; return 0;
} }
static int sonypi_misc_ioctl(struct inode *ip, struct file *fp, static int sonypi_misc_ioctl(struct inode *ip, struct file *fp,
unsigned int cmd, unsigned long arg) { unsigned int cmd, unsigned long arg)
{
int ret = 0; int ret = 0;
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
u8 val8; u8 val8;
...@@ -655,7 +676,9 @@ static struct file_operations sonypi_misc_fops = { ...@@ -655,7 +676,9 @@ static struct file_operations sonypi_misc_fops = {
}; };
struct miscdevice sonypi_misc_device = { struct miscdevice sonypi_misc_device = {
-1, "sonypi", &sonypi_misc_fops .minor = -1,
.name = "sonypi",
.fops = &sonypi_misc_fops,
}; };
static void sonypi_enable(unsigned int camera_on) static void sonypi_enable(unsigned int camera_on)
...@@ -755,18 +778,17 @@ static int __devinit sonypi_probe(void) ...@@ -755,18 +778,17 @@ static int __devinit sonypi_probe(void)
init_waitqueue_head(&sonypi_device.fifo_proc_list); init_waitqueue_head(&sonypi_device.fifo_proc_list);
init_MUTEX(&sonypi_device.lock); init_MUTEX(&sonypi_device.lock);
sonypi_device.bluetooth_power = -1; sonypi_device.bluetooth_power = -1;
if (pcidev && pci_enable_device(pcidev)) { if (pcidev && pci_enable_device(pcidev)) {
printk(KERN_ERR "sonypi: pci_enable_device failed\n"); printk(KERN_ERR "sonypi: pci_enable_device failed\n");
ret = -EIO; ret = -EIO;
goto out1; goto out_pcienable;
} }
sonypi_misc_device.minor = (minor == -1) ? sonypi_misc_device.minor = (minor == -1) ? MISC_DYNAMIC_MINOR : minor;
MISC_DYNAMIC_MINOR : minor;
if ((ret = misc_register(&sonypi_misc_device))) { if ((ret = misc_register(&sonypi_misc_device))) {
printk(KERN_ERR "sonypi: misc_register failed\n"); printk(KERN_ERR "sonypi: misc_register failed\n");
goto out1; goto out_miscreg;
} }
if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2) { if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2) {
...@@ -774,8 +796,7 @@ static int __devinit sonypi_probe(void) ...@@ -774,8 +796,7 @@ static int __devinit sonypi_probe(void)
sonypi_device.region_size = SONYPI_TYPE2_REGION_SIZE; sonypi_device.region_size = SONYPI_TYPE2_REGION_SIZE;
sonypi_device.evtype_offset = SONYPI_TYPE2_EVTYPE_OFFSET; sonypi_device.evtype_offset = SONYPI_TYPE2_EVTYPE_OFFSET;
irq_list = sonypi_type2_irq_list; irq_list = sonypi_type2_irq_list;
} } else {
else {
ioport_list = sonypi_type1_ioport_list; ioport_list = sonypi_type1_ioport_list;
sonypi_device.region_size = SONYPI_TYPE1_REGION_SIZE; sonypi_device.region_size = SONYPI_TYPE1_REGION_SIZE;
sonypi_device.evtype_offset = SONYPI_TYPE1_EVTYPE_OFFSET; sonypi_device.evtype_offset = SONYPI_TYPE1_EVTYPE_OFFSET;
...@@ -783,8 +804,8 @@ static int __devinit sonypi_probe(void) ...@@ -783,8 +804,8 @@ static int __devinit sonypi_probe(void)
} }
for (i = 0; ioport_list[i].port1; i++) { for (i = 0; ioport_list[i].port1; i++) {
if (request_region(ioport_list[i].port1, if (request_region(ioport_list[i].port1,
sonypi_device.region_size, sonypi_device.region_size,
"Sony Programable I/O Device")) { "Sony Programable I/O Device")) {
/* get the ioport */ /* get the ioport */
sonypi_device.ioport1 = ioport_list[i].port1; sonypi_device.ioport1 = ioport_list[i].port1;
...@@ -795,7 +816,7 @@ static int __devinit sonypi_probe(void) ...@@ -795,7 +816,7 @@ static int __devinit sonypi_probe(void)
if (!sonypi_device.ioport1) { if (!sonypi_device.ioport1) {
printk(KERN_ERR "sonypi: request_region failed\n"); printk(KERN_ERR "sonypi: request_region failed\n");
ret = -ENODEV; ret = -ENODEV;
goto out2; goto out_reqreg;
} }
for (i = 0; irq_list[i].irq; i++) { for (i = 0; irq_list[i].irq; i++) {
...@@ -811,18 +832,19 @@ static int __devinit sonypi_probe(void) ...@@ -811,18 +832,19 @@ static int __devinit sonypi_probe(void)
if (!irq_list[i].irq) { if (!irq_list[i].irq) {
printk(KERN_ERR "sonypi: request_irq failed\n"); printk(KERN_ERR "sonypi: request_irq failed\n");
ret = -ENODEV; ret = -ENODEV;
goto out3; goto out_reqirq;
} }
if (useinput) { if (useinput) {
/* Initialize the Input Drivers: jogdial */ /* Initialize the Input Drivers: jogdial */
int i; int i;
sonypi_device.input_jog_dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REL); sonypi_device.input_jog_dev.evbit[0] =
BIT(EV_KEY) | BIT(EV_REL);
sonypi_device.input_jog_dev.keybit[LONG(BTN_MOUSE)] = sonypi_device.input_jog_dev.keybit[LONG(BTN_MOUSE)] =
BIT(BTN_MIDDLE); BIT(BTN_MIDDLE);
sonypi_device.input_jog_dev.relbit[0] = BIT(REL_WHEEL); sonypi_device.input_jog_dev.relbit[0] = BIT(REL_WHEEL);
sonypi_device.input_jog_dev.name = sonypi_device.input_jog_dev.name =
(char *) kmalloc(sizeof(SONYPI_JOG_INPUTNAME), GFP_KERNEL); kmalloc(sizeof(SONYPI_JOG_INPUTNAME), GFP_KERNEL);
if (!sonypi_device.input_jog_dev.name) { if (!sonypi_device.input_jog_dev.name) {
printk(KERN_ERR "sonypi: kmalloc failed\n"); printk(KERN_ERR "sonypi: kmalloc failed\n");
ret = -ENOMEM; ret = -ENOMEM;
...@@ -843,7 +865,7 @@ static int __devinit sonypi_probe(void) ...@@ -843,7 +865,7 @@ static int __devinit sonypi_probe(void)
set_bit(sonypi_inputkeys[i].inputev, set_bit(sonypi_inputkeys[i].inputev,
sonypi_device.input_key_dev.keybit); sonypi_device.input_key_dev.keybit);
sonypi_device.input_key_dev.name = sonypi_device.input_key_dev.name =
(char *) kmalloc(sizeof(SONYPI_KEY_INPUTNAME), GFP_KERNEL); kmalloc(sizeof(SONYPI_KEY_INPUTNAME), GFP_KERNEL);
if (!sonypi_device.input_key_dev.name) { if (!sonypi_device.input_key_dev.name) {
printk(KERN_ERR "sonypi: kmalloc failed\n"); printk(KERN_ERR "sonypi: kmalloc failed\n");
ret = -ENOMEM; ret = -ENOMEM;
...@@ -879,8 +901,8 @@ static int __devinit sonypi_probe(void) ...@@ -879,8 +901,8 @@ static int __devinit sonypi_probe(void)
sonypi_enable(0); sonypi_enable(0);
printk(KERN_INFO "sonypi: Sony Programmable I/O Controller Driver v%s.\n", printk(KERN_INFO "sonypi: Sony Programmable I/O Controller Driver"
SONYPI_DRIVER_VERSION); "v%s.\n", SONYPI_DRIVER_VERSION);
printk(KERN_INFO "sonypi: detected %s model, " printk(KERN_INFO "sonypi: detected %s model, "
"verbose = %d, fnkeyinit = %s, camera = %s, " "verbose = %d, fnkeyinit = %s, camera = %s, "
"compat = %s, mask = 0x%08lx, useinput = %s, acpi = %s\n", "compat = %s, mask = 0x%08lx, useinput = %s, acpi = %s\n",
...@@ -894,7 +916,7 @@ static int __devinit sonypi_probe(void) ...@@ -894,7 +916,7 @@ static int __devinit sonypi_probe(void)
useinput ? "on" : "off", useinput ? "on" : "off",
SONYPI_ACPI_ACTIVE ? "on" : "off"); SONYPI_ACPI_ACTIVE ? "on" : "off");
printk(KERN_INFO "sonypi: enabled at irq=%d, port1=0x%x, port2=0x%x\n", printk(KERN_INFO "sonypi: enabled at irq=%d, port1=0x%x, port2=0x%x\n",
sonypi_device.irq, sonypi_device.irq,
sonypi_device.ioport1, sonypi_device.ioport2); sonypi_device.ioport1, sonypi_device.ioport2);
if (minor == -1) if (minor == -1)
...@@ -913,11 +935,14 @@ static int __devinit sonypi_probe(void) ...@@ -913,11 +935,14 @@ static int __devinit sonypi_probe(void)
kfree(sonypi_device.input_jog_dev.name); kfree(sonypi_device.input_jog_dev.name);
out_inkmallocinput1: out_inkmallocinput1:
free_irq(sonypi_device.irq, sonypi_irq); free_irq(sonypi_device.irq, sonypi_irq);
out3: out_reqirq:
release_region(sonypi_device.ioport1, sonypi_device.region_size); release_region(sonypi_device.ioport1, sonypi_device.region_size);
out2: out_reqreg:
misc_deregister(&sonypi_misc_device); misc_deregister(&sonypi_misc_device);
out1: out_miscreg:
if (pcidev)
pci_disable_device(pcidev);
out_pcienable:
kfifo_free(sonypi_device.fifo); kfifo_free(sonypi_device.fifo);
out_fifo: out_fifo:
pci_dev_put(sonypi_device.dev); pci_dev_put(sonypi_device.dev);
......
drivers/char/sonypi.h
View file @ ee96aa8b
/* /*
* Sony Programmable I/O Control Device driver for VAIO * Sony Programmable I/O Control Device driver for VAIO
* *
* Copyright (C) 2001-2003 Stelian Pop <stelian@popies.net> * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net>
* *
* Copyright (C) 2001-2002 Alcve <www.alcove.com> * Copyright (C) 2001-2002 Alcve <www.alcove.com>
* *
...@@ -14,24 +14,24 @@ ...@@ -14,24 +14,24 @@
* Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com>
* *
* Earlier work by Werner Almesberger, Paul `Rusty' Russell and Paul Mackerras. * Earlier work by Werner Almesberger, Paul `Rusty' Russell and Paul Mackerras.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
*/ */
#ifndef _SONYPI_PRIV_H_ #ifndef _SONYPI_PRIV_H_
#define _SONYPI_PRIV_H_ #define _SONYPI_PRIV_H_
#ifdef __KERNEL__ #ifdef __KERNEL__
...@@ -424,8 +424,8 @@ struct sonypi_device { ...@@ -424,8 +424,8 @@ struct sonypi_device {
#define SONYPI_ACPI_ACTIVE (!acpi_disabled) #define SONYPI_ACPI_ACTIVE (!acpi_disabled)
#else #else
#define SONYPI_ACPI_ACTIVE 0 #define SONYPI_ACPI_ACTIVE 0
#endif /* CONFIG_ACPI */ #endif /* CONFIG_ACPI */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _SONYPI_PRIV_H_ */ #endif /* _SONYPI_PRIV_H_ */
include/linux/sonypi.h
View file @ ee96aa8b
/* /*
* Sony Programmable I/O Control Device driver for VAIO * Sony Programmable I/O Control Device driver for VAIO
* *
* Copyright (C) 2001-2003 Stelian Pop <stelian@popies.net> * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net>
* *
* Copyright (C) 2001-2002 Alcve <www.alcove.com> * Copyright (C) 2001-2002 Alcve <www.alcove.com>
* *
...@@ -14,24 +14,24 @@ ...@@ -14,24 +14,24 @@
* Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com>
* *
* Earlier work by Werner Almesberger, Paul `Rusty' Russell and Paul Mackerras. * Earlier work by Werner Almesberger, Paul `Rusty' Russell and Paul Mackerras.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
*/ */
#ifndef _SONYPI_H_ #ifndef _SONYPI_H_
#define _SONYPI_H_ #define _SONYPI_H_
#include <linux/types.h> #include <linux/types.h>
...@@ -144,6 +144,6 @@ ...@@ -144,6 +144,6 @@
u8 sonypi_camera_command(int command, u8 value); u8 sonypi_camera_command(int command, u8 value);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _SONYPI_H_ */ #endif /* _SONYPI_H_ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7