Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 862aad56 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents cc6120c6 d58dde0f

Documentation/aoe/mkshelf.sh

+4 −2
Original line number Diff line number Diff line
@@ -8,13 +8,15 @@ fi 
n_partitions=${n_partitions:-16}

dir=$1

shelf=$2

nslots=16

maxslot=`echo $nslots 1 - p | dc`

MAJOR=152



set -e



minor=`echo 10 \* $shelf \* $n_partitions | bc`

minor=`echo $nslots \* $shelf \* $n_partitions | 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

		name=e$shelf.$slot

		test "$part" != "0" && name=${name}p$part

Documentation/firmware_class/firmware_sample_driver.c

+4 −4
Original line number Diff line number Diff line
@@ -32,14 +32,14 @@ static void sample_firmware_load(char *firmware, int size) 
	u8 buf[size+1];

	memcpy(buf, firmware, size);

	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)

{

	/* uses the default method to get the firmware */

        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)

	{
@@ -61,7 +61,7 @@ static void sample_probe_specific(void) 


	/* 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)

	{
@@ -83,7 +83,7 @@ static void sample_probe_async_cont(const struct firmware *fw, void *context) 
		return;

	}



	printk("firmware_sample_driver: device pointer \"%s\"\n",

	printk(KERN_INFO "firmware_sample_driver: device pointer \"%s\"\n",

	       (char *)context);

	sample_firmware_load(fw->data, fw->size);

}

drivers/block/aoe/aoe.h

+6 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */

#define VERSION "10"

#define VERSION "12"

#define AOE_MAJOR 152

#define DEVICE_NAME "aoe"
@@ -7,12 +7,12 @@ 
 * default is 16, which is 15 partitions plus the whole disk

 */

#ifndef AOE_PARTITIONS

#define AOE_PARTITIONS 16

#define AOE_PARTITIONS (16)

#endif



#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * 10 + (aoeminor))

#define AOEMAJOR(sysminor) ((sysminor) / 10)

#define AOEMINOR(sysminor) ((sysminor) % 10)

#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * NPERSHELF + (aoeminor))

#define AOEMAJOR(sysminor) ((sysminor) / NPERSHELF)

#define AOEMINOR(sysminor) ((sysminor) % NPERSHELF)

#define WHITESPACE " \t\v\f\n"



enum {
@@ -83,7 +83,7 @@ enum { 


enum {

	MAXATADATA = 1024,

	NPERSHELF = 10,

	NPERSHELF = 16,		/* number of slots per shelf address */

	FREETAG = -1,

	MIN_BUFS = 8,

};