openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

This commit is contained in:
Linus Torvalds 2005-09-12 13:32:56 -07:00
parent cc6120c668 d58dde0f55
commit 862aad56dc
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/aoe/mkshelf.sh
View File

@ -8,13 +8,15 @@ fi
n_partitions=${n_partitions:-16} n_partitions=${n_partitions:-16}
dir=$1 dir=$1
shelf=$2 shelf=$2
nslots=16
maxslot=`echo $nslots 1 - p | dc`
MAJOR=152 MAJOR=152
set -e set -e
minor=`echo 10 \* $shelf \* $n_partitions | bc` minor=`echo $nslots \* $shelf \* $n_partitions | bc`
endp=`echo $n_partitions - 1 | bc` endp=`echo $n_partitions - 1 | bc`
for slot in `seq 0 9`; do for slot in `seq 0 $maxslot`; do
for part in `seq 0 $endp`; do for part in `seq 0 $endp`; do
name=e$shelf.$slot name=e$shelf.$slot
test "$part" != "0" && name=${name}p$part test "$part" != "0" && name=${name}p$part

8
Documentation/firmware_class/firmware_sample_driver.c
View File

@ -32,14 +32,14 @@ static void sample_firmware_load(char *firmware, int size)
u8 buf[size+1]; u8 buf[size+1];
memcpy(buf, firmware, size); memcpy(buf, firmware, size);
buf[size] = '\0'; buf[size] = '\0';
printk("firmware_sample_driver: firmware: %s\n", buf); printk(KERN_INFO "firmware_sample_driver: firmware: %s\n", buf);
} }
static void sample_probe_default(void) static void sample_probe_default(void)
{ {
/* uses the default method to get the firmware */ /* uses the default method to get the firmware */
const struct firmware *fw_entry; const struct firmware *fw_entry;
printk("firmware_sample_driver: a ghost device got inserted :)\n"); printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
if(request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0) if(request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0)
{ {
@ -61,7 +61,7 @@ static void sample_probe_specific(void)
/* NOTE: This currently doesn't work */ /* NOTE: This currently doesn't work */
printk("firmware_sample_driver: a ghost device got inserted :)\n"); printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
if(request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0) if(request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0)
{ {
@ -83,7 +83,7 @@ static void sample_probe_async_cont(const struct firmware *fw, void *context)
return; return;
} }
printk("firmware_sample_driver: device pointer \"%s\"\n", printk(KERN_INFO "firmware_sample_driver: device pointer \"%s\"\n",
(char *)context); (char *)context);
sample_firmware_load(fw->data, fw->size); sample_firmware_load(fw->data, fw->size);
} }

12
drivers/block/aoe/aoe.h
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2004 Coraid, Inc. See COPYING for GPL terms. */ /* Copyright (c) 2004 Coraid, Inc. See COPYING for GPL terms. */
#define VERSION "10" #define VERSION "12"
#define AOE_MAJOR 152 #define AOE_MAJOR 152
#define DEVICE_NAME "aoe" #define DEVICE_NAME "aoe"
@ -7,12 +7,12 @@
* default is 16, which is 15 partitions plus the whole disk * default is 16, which is 15 partitions plus the whole disk
*/ */
#ifndef AOE_PARTITIONS #ifndef AOE_PARTITIONS
#define AOE_PARTITIONS 16 #define AOE_PARTITIONS (16)
#endif #endif
#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * 10 + (aoeminor)) #define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * NPERSHELF + (aoeminor))
#define AOEMAJOR(sysminor) ((sysminor) / 10) #define AOEMAJOR(sysminor) ((sysminor) / NPERSHELF)
#define AOEMINOR(sysminor) ((sysminor) % 10) #define AOEMINOR(sysminor) ((sysminor) % NPERSHELF)
#define WHITESPACE " \t\v\f\n" #define WHITESPACE " \t\v\f\n"
enum { enum {
@ -83,7 +83,7 @@ enum {
enum { enum {
MAXATADATA = 1024, MAXATADATA = 1024,
NPERSHELF = 10, NPERSHELF = 16, /* number of slots per shelf address */
FREETAG = -1, FREETAG = -1,
MIN_BUFS = 8, MIN_BUFS = 8,
}; };