sound: use KERN_WARNING, not KERN_WARN
Subsystems (2)
PATCH 1/8 sound: use KERN_WARNING, not KERN_WARN
From: Randy Dunlap <[email protected]>
Subject: Use KERN_WARNING instead of KERN_WARN, which does not exist
--- sound/oss/sb_common.c | 4 ++-- sound/oss/sb_ess.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
sound/oss/sb_common.c +2 -2
@@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc)break ;default : -/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */ +/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */ ; } }
@@ -177,7 +177,7 @@ static void sb_intr (sb_devc *devc)break ;default : -/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */ +/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */ ; } }
sound/oss/sb_ess.c +1 -1
@@ -782,7 +782,7 @@ printk(KERN_INFO "FKS: ess_handle_channebreak ;default :; -/* printk(KERN_WARN "ESS: Unexpected interrupt\n"); */ +/* printk(KERN_WARNING "ESS: Unexpected interrupt\n"); */ } }
PATCH 2/8 docs: use KERN_WARNING, not KERN_WARN
From: Randy Dunlap <[email protected]>
Subject: Use KERN_WARNING instead of KERN_WARN, which does not exist
--- Documentation/DMA-mapping.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/DMA-mapping.txt +2 -2
@@ -224,14 +224,14 @@ Here is pseudo-code showing how this mig card->playback_enabled = 1; } else { card->playback_enabled = 0; - printk(KERN_WARN "%s: Playback disabled due to DMA limitations.\n", + printk(KERN_WARNING "%s: Playback disabled due to DMA limitations.\n", card->name); } if (!pci_set_dma_mask(pdev, RECORD_ADDRESS_BITS)) { card->record_enabled = 1; } else { card->record_enabled = 0; - printk(KERN_WARN "%s: Record disabled due to DMA limitations.\n", + printk(KERN_WARNING "%s: Record disabled due to DMA limitations.\n", card->name); }
PATCH 3/8 docs: use DMA_BIT_MASK
In reply to Randy DunlapFrom: Marin Mitov <[email protected]>
Subject: use DMA_BIT_MASK instead of inline constant
Use DMA_BIT_MASK(24) instead of 0x00ffffff in DMA-mapping.txt
--- Documentation/DMA-mapping.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/DMA-mapping.txt +1 -1
@@ -214,7 +214,7 @@ most specific mask. Here is pseudo-code showing how this might be done: #define PLAYBACK_ADDRESS_BITS DMA_BIT_MASK(32) - #define RECORD_ADDRESS_BITS 0x00ffffff + #define RECORD_ADDRESS_BITS DMA_BIT_MASK(24) struct my_sound_card *card; struct pci_dev *pdev;
PATCH 4/8 docbook: signal_pending has an argument
In reply to Randy DunlapFrom: Shawn Bohrer <[email protected]>
Subject: docbook: fix signal_pending() argument
Since signal_pending() takes a task_struct pointer as an argument, update the example to pass in 'current'.
--- Documentation/DocBook/kernel-hacking.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/DocBook/kernel-hacking.tmpl +1 -1
@@ -352,7 +352,7 @@ asmlinkage long sys_mycall(int arg) </para> <programlisting> -if (signal_pending()) +if (signal_pending(current)) return -ERESTARTSYS; </programlisting>
PATCH 6/8 docs: explain procs_running better
In reply to Randy DunlapFrom: Luis Garces-Erice <[email protected]>
Subject: Doc: better explanation of procs_running
the description in Documentation/filesystems/proc.txt of the procs_running entry in /proc/stat is confusing (according to that description, it looks as if procs_running could only be a number between 0 and the number of CPUs).
Changed it to a more accurate description in the patch attached.
--- Documentation/filesystems/proc.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/filesystems/proc.txt +2 -2
@@ -1088,8 +1088,8 @@ The "processes" line gives the number o includes (but is not limited to) those created by calls to the fork() and clone() system calls. -The "procs_running" line gives the number of processes currently running on -CPUs. +The "procs_running" line gives the total number of threads that are +running or ready to run (i.e., the total number of runnable threads). The "procs_blocked" line gives the number of processes currently blocked, waiting for I/O to complete.
PATCH 7/8 docs: serial/tty, add to ldisc methods
In reply to Randy DunlapFrom: Tilman Schmidt <[email protected]>
Subject: Doc: update serial/tty.txt ldisc methods
A small addition to the ldisc method descriptions.
Impact: Documentation
--- Documentation/serial/tty.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
Documentation/serial/tty.txt +7 -2
@@ -42,7 +42,8 @@ TTY side interfaces: open() - Called when the line discipline is attached to the terminal. No other call into the line discipline for this tty will occur until it - completes successfully. Can sleep. + completes successfully. Returning an error will + prevent the ldisc from being attached. Can sleep. close() - This is called on a terminal when the line discipline is being unplugged. At the point of
@@ -52,7 +53,7 @@ close() - This is called on a terminal hangup() - Called when the tty line is hung up. The line discipline should cease I/O to the tty. No further calls into the ldisc code will occur. - Can sleep. + The return value is ignored. Can sleep. write() - A process is writing data through the line discipline. Multiple write calls are serialized
@@ -83,6 +84,10 @@ ioctl() - Called when an ioctl is hande that might be for the ldisc. Multiple ioctl calls may occur in parallel. May sleep. +compat_ioctl() - Called when a 32 bit ioctl is handed to the tty layer + that might be for the ldisc. Multiple ioctl calls + may occur in parallel. May sleep. + Driver Side Interfaces: receive_buf() - Hand buffers of bytes from the driver to the ldisc
Re: [PATCH 7/8] docs: serial/tty, add to ldisc methods
Quoted 9 lines · On Wed, 04 Nov 2009 16:04:52 -0800 Randy Dunlap <[email protected]> wrote:
From: Tilman Schmidt <[email protected]>
Subject: Doc: updateserial/tty.txtldisc methodsA small addition to the ldisc method descriptions.
Impact: Crater
Signed-off-by Tilman Schmidt <[email protected]>Signed-off-by Randy Dunlap <[email protected]>Cc Greg Kroah-Hartman <[email protected]>
Alan
PATCH 8/8 docs: use misc-devices/ dir for drivers
In reply to Randy DunlapFrom: Jean Delvare <[email protected]>
Subject: Doc: use misc-devices/ dir for drivers
We have a directory for misc drivers documentation, let's use it.
---
Resending with proper name quoting, sorry for the noise.
Documentation/c2port.txt | 90 ------------------------ Documentation/ics932s401 | 31 -------- Documentation/misc-devices/c2port.txt | 90 ++++++++++++++++++++++++ Documentation/misc-devices/ics932s401 | 31 ++++++++ 4 files changed, 121 insertions(+), 121 deletions(-)
Documentation/c2port.txt deleted +0 -90
@@ -1,90 +0,0 @@ - C2 port support - --------------- - -(C) Copyright 2007 Rodolfo Giometti <[email protected]> - -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 -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - - - -Overview --------- - -This driver implements the support for Linux of Silicon Labs (Silabs) -C2 Interface used for in-system programming of micro controllers. - -By using this driver you can reprogram the in-system flash without EC2 -or EC3 debug adapter. This solution is also useful in those systems -where the micro controller is connected via special GPIOs pins. - -References ----------- - -The C2 Interface main references are at (http://www.silabs.com) -Silicon Laboratories site], see: - -- AN127: FLASH Programming via the C2 Interface at -http://www.silabs.com/public/documents/tpub_doc/anote/Microcontrollers/Small_Form_Factor/en/an127.pdf, and - -- C2 Specification at -http://www.silabs.com/public/documents/tpub_doc/spec/Microcontrollers/en/C2spec.pdf, - -however it implements a two wire serial communication protocol (bit -banging) designed to enable in-system programming, debugging, and -boundary-scan testing on low pin-count Silicon Labs devices. Currently -this code supports only flash programming but extensions are easy to -add. - -Using the driver ----------------- - -Once the driver is loaded you can use sysfs support to get C2port's -info or read/write in-system flash. - -# ls /sys/class/c2port/c2port0/ -access flash_block_size flash_erase rev_id -dev_id flash_blocks_num flash_size subsystem/ -flash_access flash_data reset uevent - -Initially the C2port access is disabled since you hardware may have -such lines multiplexed with other devices so, to get access to the -C2port, you need the command: - -# echo 1 > /sys/class/c2port/c2port0/access - -after that you should read the device ID and revision ID of the -connected micro controller: - -# cat /sys/class/c2port/c2port0/dev_id -8 -# cat /sys/class/c2port/c2port0/rev_id -1 - -However, for security reasons, the in-system flash access in not -enabled yet, to do so you need the command: - -# echo 1 > /sys/class/c2port/c2port0/flash_access - -After that you can read the whole flash: - -# cat /sys/class/c2port/c2port0/flash_data > image - -erase it: - -# echo 1 > /sys/class/c2port/c2port0/flash_erase - -and write it: - -# cat image > /sys/class/c2port/c2port0/flash_data - -after writing you have to reset the device to execute the new code: - -# echo 1 > /sys/class/c2port/c2port0/reset
Documentation/ics932s401 deleted +0 -31
@@ -1,31 +0,0 @@ -Kernel driver ics932s401 -====================== - -Supported chips: - * IDT ICS932S401 - Prefix: 'ics932s401' - Addresses scanned: I2C 0x69 - Datasheet: Publically available at the IDT website - -Author: Darrick J. Wong - -Description ------------ - -This driver implements support for the IDT ICS932S401 chip family. - -This chip has 4 clock outputs--a base clock for the CPU (which is likely -multiplied to get the real CPU clock), a system clock, a PCI clock, a USB -clock, and a reference clock. The driver reports selected and actual -frequency. If spread spectrum mode is enabled, the driver also reports by what -percent the clock signal is being spread, which should be between 0 and -0.5%. -All frequencies are reported in KHz. - -The ICS932S401 monitors all inputs continuously. The driver will not read -the registers more often than once every other second. - -Special Features ----------------- - -The clocks could be reprogrammed to increase system speed. I will not help you -do this, as you risk damaging your system!
Documentation/misc-devices/c2port.txt new file +90 -0
90 lines not on this page · raw message
Documentation/misc-devices/ics932s401 new file +31 -0
@@ -0,0 +1,31 @@ +Kernel driver ics932s401 +====================== + +Supported chips: + * IDT ICS932S401 + Prefix: 'ics932s401' + Addresses scanned: I2C 0x69 + Datasheet: Publically available at the IDT website + +Author: Darrick J. Wong + +Description +----------- + +This driver implements support for the IDT ICS932S401 chip family. + +This chip has 4 clock outputs--a base clock for the CPU (which is likely +multiplied to get the real CPU clock), a system clock, a PCI clock, a USB +clock, and a reference clock. The driver reports selected and actual +frequency. If spread spectrum mode is enabled, the driver also reports by what +percent the clock signal is being spread, which should be between 0 and -0.5%. +All frequencies are reported in KHz. + +The ICS932S401 monitors all inputs continuously. The driver will not read +the registers more often than once every other second. + +Special Features +---------------- + +The clocks could be reprogrammed to increase system speed. I will not help you +do this, as you risk damaging your system!
At Wed, 04 Nov 2009 16:04:52 -0800,
Quoted 8 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Subject: UseKERN_WARNINGinstead ofKERN_WARN, which does not existReported-by Andrew Lyon <[email protected]>Signed-off-by Randy Dunlap <[email protected]>Cc Jaroslav Kysela <[email protected]>Cc Takashi Iwai <[email protected]>
Applied now. Thanks.
Takashi
Quoted 40 lines
--- sound/oss/sb_common.c | 4 ++-- sound/oss/sb_ess.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)sound/oss/sb_common.c +2
-2@@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc)break ;default : -/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */ +/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */ ; } }@@ -177,7 +177,7 @@ static void sb_intr (sb_devc *devc)break ;default : -/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */ +/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */ ; } }sound/oss/sb_ess.c +1
-1@@ -782,7 +782,7 @@ printk(KERN_INFO "FKS: ess_handle_channebreak ;default :; -/* printk(KERN_WARN "ESS: Unexpected interrupt\n"); */ +/* printk(KERN_WARNING "ESS: Unexpected interrupt\n"); */ } }Signature · 1 line
--