Commit 0b103497 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://gkernel.bkbits.net/misc-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents e3fc88e7 66bf70c2
...@@ -155,7 +155,6 @@ static int print_unex = 1; ...@@ -155,7 +155,6 @@ static int print_unex = 1;
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/version.h>
#define FDPATCHES #define FDPATCHES
#include <linux/fdreg.h> #include <linux/fdreg.h>
......
...@@ -56,31 +56,27 @@ ...@@ -56,31 +56,27 @@
/* /*
* debugging macros * debugging macros
*/ */
#undef RNG_DEBUG /* define to enable copious debugging info */
#ifdef RNG_DEBUG /* pr_debug() collapses to a no-op if DEBUG is not defined */
/* note: prints function name for you */ #define DPRINTK(fmt, args...) pr_debug(PFX "%s: " fmt, __FUNCTION__ , ## args)
#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
#else
#define DPRINTK(fmt, args...)
#endif
#define RNG_NDEBUG /* define to disable lightweight runtime checks */ #undef RNG_NDEBUG /* define to enable lightweight runtime checks */
#ifdef RNG_NDEBUG #ifdef RNG_NDEBUG
#define assert(expr) #define assert(expr) \
if(!(expr)) { \
printk(KERN_DEBUG PFX "Assertion failed! %s,%s,%s," \
"line=%d\n", #expr, __FILE__, __FUNCTION__, __LINE__); \
}
#else #else
#define assert(expr) \ #define assert(expr)
if(!(expr)) { \
printk( "Assertion failed! %s,%s,%s,line=%d\n", \
#expr,__FILE__,__FUNCTION__,__LINE__); \
}
#endif #endif
#define RNG_MISCDEV_MINOR 183 /* official */ #define RNG_MISCDEV_MINOR 183 /* official */
static int rng_dev_open (struct inode *inode, struct file *filp); static int rng_dev_open (struct inode *inode, struct file *filp);
static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size, static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,
loff_t * offp); loff_t * offp);
static int __init intel_init (struct pci_dev *dev); static int __init intel_init (struct pci_dev *dev);
static void intel_cleanup(void); static void intel_cleanup(void);
...@@ -322,7 +318,8 @@ static int __init amd_init (struct pci_dev *dev) ...@@ -322,7 +318,8 @@ static int __init amd_init (struct pci_dev *dev)
rnen |= (1 << 7); /* PMIO enable */ rnen |= (1 << 7); /* PMIO enable */
pci_write_config_byte(dev, 0x41, rnen); pci_write_config_byte(dev, 0x41, rnen);
printk(KERN_INFO PFX "AMD768 system management I/O registers at 0x%X.\n", pmbase); pr_info( PFX "AMD768 system management I/O registers at 0x%X.\n",
pmbase);
amd_dev = dev; amd_dev = dev;
...@@ -369,7 +366,7 @@ enum { ...@@ -369,7 +366,7 @@ enum {
VIA_RNG_CHUNK_1_MASK = 0xFF, VIA_RNG_CHUNK_1_MASK = 0xFF,
}; };
u32 via_rng_datum; static u32 via_rng_datum;
/* /*
* Investigate using the 'rep' prefix to obtain 32 bits of random data * Investigate using the 'rep' prefix to obtain 32 bits of random data
...@@ -483,7 +480,7 @@ static int rng_dev_open (struct inode *inode, struct file *filp) ...@@ -483,7 +480,7 @@ static int rng_dev_open (struct inode *inode, struct file *filp)
static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size, static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,
loff_t * offp) loff_t * offp)
{ {
static spinlock_t rng_lock = SPIN_LOCK_UNLOCKED; static spinlock_t rng_lock = SPIN_LOCK_UNLOCKED;
unsigned int have_data; unsigned int have_data;
...@@ -606,7 +603,7 @@ static int __init rng_init (void) ...@@ -606,7 +603,7 @@ static int __init rng_init (void)
if (rc) if (rc)
return rc; return rc;
printk (KERN_INFO RNG_DRIVER_NAME " loaded\n"); pr_info( RNG_DRIVER_NAME " loaded\n");
DPRINTK ("EXIT, returning 0\n"); DPRINTK ("EXIT, returning 0\n");
return 0; return 0;
......
...@@ -3460,15 +3460,15 @@ static int i810_pm_resume(struct pci_dev *dev) ...@@ -3460,15 +3460,15 @@ static int i810_pm_resume(struct pci_dev *dev)
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
MODULE_AUTHOR(""); MODULE_AUTHOR("The Linux kernel team");
MODULE_DESCRIPTION("Intel 810 audio support"); MODULE_DESCRIPTION("Intel 810 audio support");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_PARM(ftsodell, "i"); module_param(ftsodell, int, 0444);
MODULE_PARM(clocking, "i"); module_param(clocking, uint, 0444);
MODULE_PARM(strict_clocking, "i"); module_param(strict_clocking, int, 0444);
MODULE_PARM(spdif_locked, "i"); module_param(spdif_locked, int, 0444);
#define I810_MODULE_NAME "intel810_audio" #define I810_MODULE_NAME "i810_audio"
static struct pci_driver i810_pci_driver = { static struct pci_driver i810_pci_driver = {
.name = I810_MODULE_NAME, .name = I810_MODULE_NAME,
......
...@@ -535,8 +535,8 @@ static const struct { ...@@ -535,8 +535,8 @@ static const struct {
static int dmabuf; static int dmabuf;
static int dmabug; static int dmabug;
MODULE_PARM(dmabuf, "i"); module_param(dmabuf, int, 0444);
MODULE_PARM(dmabug, "i"); module_param(dmabug, int, 0444);
static int __init oss_init(void) static int __init oss_init(void)
{ {
......
...@@ -430,11 +430,11 @@ EXPORT_SYMBOL(uart401intr); ...@@ -430,11 +430,11 @@ EXPORT_SYMBOL(uart401intr);
static struct address_info cfg_mpu; static struct address_info cfg_mpu;
static int __initdata io = -1; static int io = -1;
static int __initdata irq = -1; static int irq = -1;
MODULE_PARM(io, "i"); module_param(io, int, 0444);
MODULE_PARM(irq, "i"); module_param(irq, int, 0444);
static int __init init_uart401(void) static int __init init_uart401(void)
......
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