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
Show 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
*
* 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>
*
......@@ -125,7 +125,8 @@ static int sonypi_ec_read(u8 addr, u8 *value)
return 0;
}
static int ec_read16(u8 addr, u16 *value) {
static int ec_read16(u8 addr, u16 *value)
{
u8 val_lb, val_hb;
if (sonypi_ec_read(addr, &val_lb))
return -1;
......@@ -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 */
static void sonypi_type1_srs(void) {
static void sonypi_type1_srs(void)
{
u32 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_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v);
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);
v = inl(SONYPI_IRQ_PORT);
v &= ~(((u32)0x3) << SONYPI_IRQ_SHIFT);
v |= (((u32)sonypi_device.bits) << SONYPI_IRQ_SHIFT);
v &= ~(((u32) 0x3) << SONYPI_IRQ_SHIFT);
v |= (((u32) sonypi_device.bits) << SONYPI_IRQ_SHIFT);
outl(v, SONYPI_IRQ_PORT);
pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v);
......@@ -158,7 +160,8 @@ static void sonypi_type1_srs(void) {
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))
printk(KERN_WARNING "ec_write failed\n");
if (sonypi_ec_write(SONYPI_SLOB, sonypi_device.ioport1 & 0x00FF))
......@@ -169,7 +172,8 @@ static void sonypi_type2_srs(void) {
}
/* 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;
pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v);
......@@ -181,7 +185,8 @@ static void sonypi_type1_dis(void) {
outl(v, SONYPI_IRQ_PORT);
}
static void sonypi_type2_dis(void) {
static void sonypi_type2_dis(void)
{
if (sonypi_ec_write(SONYPI_SHIB, 0))
printk(KERN_WARNING "ec_write failed\n");
if (sonypi_ec_write(SONYPI_SLOB, 0))
......@@ -190,7 +195,8 @@ static void sonypi_type2_dis(void) {
printk(KERN_WARNING "ec_write failed\n");
}
static u8 sonypi_call1(u8 dev) {
static u8 sonypi_call1(u8 dev)
{
u8 v1, v2;
wait_on_command(0, inb_p(sonypi_device.ioport2) & 2, ITERATIONS_LONG);
......@@ -200,7 +206,8 @@ static u8 sonypi_call1(u8 dev) {
return v2;
}
static u8 sonypi_call2(u8 dev, u8 fn) {
static u8 sonypi_call2(u8 dev, u8 fn)
{
u8 v1;
wait_on_command(0, inb_p(sonypi_device.ioport2) & 2, ITERATIONS_LONG);
......@@ -211,7 +218,8 @@ static u8 sonypi_call2(u8 dev, u8 fn) {
return v1;
}
static u8 sonypi_call3(u8 dev, u8 fn, u8 v) {
static u8 sonypi_call3(u8 dev, u8 fn, u8 v)
{
u8 v1;
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) {
return v1;
}
static u8 sonypi_read(u8 fn) {
static u8 sonypi_read(u8 fn)
{
u8 v1, v2;
int n = 100;
......@@ -238,13 +247,14 @@ static u8 sonypi_read(u8 fn) {
}
/* 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);
}
/* Tests if the camera is ready */
static int sonypi_camera_ready(void) {
static int sonypi_camera_ready(void)
{
u8 v;
v = sonypi_call2(0x8f, SONYPI_CAMERA_STATUS);
......@@ -252,8 +262,8 @@ static int sonypi_camera_ready(void) {
}
/* 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);
if (!sonypi_device.camera_power)
......@@ -264,7 +274,8 @@ static void sonypi_camera_off(void) {
}
/* Turns the camera on */
static void sonypi_camera_on(void) {
static void sonypi_camera_on(void)
{
int i, j;
if (sonypi_device.camera_power)
......@@ -298,9 +309,10 @@ static void sonypi_camera_on(void) {
}
/* sets the bluetooth subsystem power state */
static void sonypi_setbluetoothpower(u8 state) {
static void sonypi_setbluetoothpower(u8 state)
{
state = !!state;
if (sonypi_device.bluetooth_power == state)
return;
......@@ -331,7 +343,8 @@ static void input_keyrelease(void *data)
}
/* 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;
int i, j;
......@@ -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++) {
if (sonypi_device.model != sonypi_eventtypes[i].model)
continue;
if ((v2 & sonypi_eventtypes[i].data) != sonypi_eventtypes[i].data)
if ((v2 & sonypi_eventtypes[i].data) !=
sonypi_eventtypes[i].data)
continue;
if (! (mask & sonypi_eventtypes[i].mask))
if (!(mask & sonypi_eventtypes[i].mask))
continue;
for (j = 0; sonypi_eventtypes[i].events[j].event; j++) {
if (v1 == sonypi_eventtypes[i].events[j].data) {
......@@ -355,7 +369,8 @@ static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) {
if (verbose)
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*
* events belonging to the sonypi device we don't know about,
* but we still don't want those to pollute the logs... */
......@@ -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) */
u8 sonypi_camera_command(int command, u8 value) {
u8 sonypi_camera_command(int command, u8 value)
{
u8 ret = 0;
if (!camera)
......@@ -428,7 +444,7 @@ u8 sonypi_camera_command(int command, u8 value) {
down(&sonypi_device.lock);
switch(command) {
switch (command) {
case SONYPI_COMMAND_GETCAMERA:
ret = sonypi_camera_ready();
break;
......@@ -497,7 +513,8 @@ u8 sonypi_camera_command(int command, u8 value) {
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;
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) {
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);
down(&sonypi_device.lock);
sonypi_device.open_count--;
......@@ -514,7 +532,8 @@ static int sonypi_misc_release(struct inode * inode, struct file * file) {
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);
/* Flush input queue on first open */
if (!sonypi_device.open_count)
......@@ -524,7 +543,7 @@ static int sonypi_misc_open(struct inode * inode, struct file * file) {
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)
{
ssize_t ret;
......@@ -552,7 +571,8 @@ static ssize_t sonypi_misc_read(struct file * file, char __user * buf,
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);
if (kfifo_len(sonypi_device.fifo))
return POLLIN | POLLRDNORM;
......@@ -560,7 +580,8 @@ static unsigned int sonypi_misc_poll(struct file *file, poll_table * wait) {
}
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;
void __user *argp = (void __user *)arg;
u8 val8;
......@@ -655,7 +676,9 @@ static struct file_operations sonypi_misc_fops = {
};
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)
......@@ -759,14 +782,13 @@ static int __devinit sonypi_probe(void)
if (pcidev && pci_enable_device(pcidev)) {
printk(KERN_ERR "sonypi: pci_enable_device failed\n");
ret = -EIO;
goto out1;
goto out_pcienable;
}
sonypi_misc_device.minor = (minor == -1) ?
MISC_DYNAMIC_MINOR : minor;
sonypi_misc_device.minor = (minor == -1) ? MISC_DYNAMIC_MINOR : minor;
if ((ret = misc_register(&sonypi_misc_device))) {
printk(KERN_ERR "sonypi: misc_register failed\n");
goto out1;
goto out_miscreg;
}
if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2) {
......@@ -774,8 +796,7 @@ static int __devinit sonypi_probe(void)
sonypi_device.region_size = SONYPI_TYPE2_REGION_SIZE;
sonypi_device.evtype_offset = SONYPI_TYPE2_EVTYPE_OFFSET;
irq_list = sonypi_type2_irq_list;
}
else {
} else {
ioport_list = sonypi_type1_ioport_list;
sonypi_device.region_size = SONYPI_TYPE1_REGION_SIZE;
sonypi_device.evtype_offset = SONYPI_TYPE1_EVTYPE_OFFSET;
......@@ -795,7 +816,7 @@ static int __devinit sonypi_probe(void)
if (!sonypi_device.ioport1) {
printk(KERN_ERR "sonypi: request_region failed\n");
ret = -ENODEV;
goto out2;
goto out_reqreg;
}
for (i = 0; irq_list[i].irq; i++) {
......@@ -811,18 +832,19 @@ static int __devinit sonypi_probe(void)
if (!irq_list[i].irq) {
printk(KERN_ERR "sonypi: request_irq failed\n");
ret = -ENODEV;
goto out3;
goto out_reqirq;
}
if (useinput) {
/* Initialize the Input Drivers: jogdial */
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)] =
BIT(BTN_MIDDLE);
sonypi_device.input_jog_dev.relbit[0] = BIT(REL_WHEEL);
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) {
printk(KERN_ERR "sonypi: kmalloc failed\n");
ret = -ENOMEM;
......@@ -843,7 +865,7 @@ static int __devinit sonypi_probe(void)
set_bit(sonypi_inputkeys[i].inputev,
sonypi_device.input_key_dev.keybit);
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) {
printk(KERN_ERR "sonypi: kmalloc failed\n");
ret = -ENOMEM;
......@@ -879,8 +901,8 @@ static int __devinit sonypi_probe(void)
sonypi_enable(0);
printk(KERN_INFO "sonypi: Sony Programmable I/O Controller Driver v%s.\n",
SONYPI_DRIVER_VERSION);
printk(KERN_INFO "sonypi: Sony Programmable I/O Controller Driver"
"v%s.\n", SONYPI_DRIVER_VERSION);
printk(KERN_INFO "sonypi: detected %s model, "
"verbose = %d, fnkeyinit = %s, camera = %s, "
"compat = %s, mask = 0x%08lx, useinput = %s, acpi = %s\n",
......@@ -913,11 +935,14 @@ static int __devinit sonypi_probe(void)
kfree(sonypi_device.input_jog_dev.name);
out_inkmallocinput1:
free_irq(sonypi_device.irq, sonypi_irq);
out3:
out_reqirq:
release_region(sonypi_device.ioport1, sonypi_device.region_size);
out2:
out_reqreg:
misc_deregister(&sonypi_misc_device);
out1:
out_miscreg:
if (pcidev)
pci_disable_device(pcidev);
out_pcienable:
kfifo_free(sonypi_device.fifo);
out_fifo:
pci_dev_put(sonypi_device.dev);
......
drivers/char/sonypi.h
View file @ ee96aa8b
/*
* 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>
*
......
include/linux/sonypi.h
View file @ ee96aa8b
/*
* 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>
*
......
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