linux.git/drivers/staging/phison, branch v2.6.34 Linux kernel source tree Staging: merge staging patches into Linus's main branch 2010-03-04T16:39:02+00:00 Greg Kroah-Hartman gregkh@suse.de 2010-03-04T16:39:02+00:00 f341dddf1dadf64be309791f83d7904245f1261d There were a number of patches that went into Linus's tree already that conflicted with other changes in the staging branch. This merge resolves those merge conflicts. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
There were a number of patches that went into Linus's
tree already that conflicted with other changes in the
staging branch.  This merge resolves those merge conflicts.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
staging: make PCI device id constant 2010-03-04T00:42:42+00:00 Németh Márton nm127@freemail.hu 2010-01-09T23:18:26+00:00 13ac58dac0c6b1edeb060102049b07ebceea9a40 The id_table field of the struct pci_driver is constant in <linux/pci.h> so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // </smpl> Signed-off-by: Németh Márton <nm127@freemail.hu> Cc: Julia Lawall <julia@diku.dk> Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
The id_table field of the struct pci_driver is constant in <linux/pci.h>
so it is worth to make the initialization data also constant.

The semantic match that finds this kind of pattern is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r@
disable decl_init,const_decl_init;
identifier I1, I2, x;
@@
	struct I1 {
	  ...
	  const struct I2 *x;
	  ...
	};
@s@
identifier r.I1, y;
identifier r.x, E;
@@
	struct I1 y = {
	  .x = E,
	};
@c@
identifier r.I2;
identifier s.E;
@@
	const struct I2 E[] = ... ;
@depends on !c@
identifier r.I2;
identifier s.E;
@@
+	const
	struct I2 E[] = ...;
// </smpl>

Signed-off-by: Németh Márton <nm127@freemail.hu>
Cc: Julia Lawall <julia@diku.dk>
Cc: cocci@diku.dk
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
libata: Pass host flags into the pci helper 2010-03-01T19:58:46+00:00 Alan Cox alan@linux.intel.com 2010-02-23T07:26:06+00:00 16ea0fc98d53c72cb4e1a9edcb685a87e3a81430 This allows parallel scan and the like to be set without having to stop using the existing full helper functions. This patch merely adds the argument and fixes up the callers. It doesn't undo the special cases already in the tree or add any new parallel callers. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com> 
This allows parallel scan and the like to be set without having to stop
using the existing full helper functions. This patch merely adds the argument
and fixes up the callers. It doesn't undo the special cases already in the
tree or add any new parallel callers.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Staging: phison: adding __init/__exit macros 2009-12-11T20:23:05+00:00 Peter Huewe peterhuewe@gmx.de 2009-09-28T23:53:16+00:00 73d3f6652a153a33648a2213c03e292809cc9ddb Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/staging/phison/phison.c Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions of drivers/staging/phison/phison.c

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Staging: phison: depends on PCI 2009-04-03T21:53:40+00:00 Randy Dunlap randy.dunlap@oracle.com 2009-02-19T17:47:32+00:00 3bfd0583639a292da151fba7321d6fe5bd40f50d phison uses PCI interfaces, so it should depend on PCI. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Evan Ko <evan_ko@phison.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
phison uses PCI interfaces, so it should depend on PCI.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Evan Ko <evan_ko@phison.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Staging: phison: fix kconfig for clean build 2009-04-03T21:53:40+00:00 Randy Dunlap randy.dunlap@oracle.com 2009-02-16T16:46:16+00:00 1cc41726fddd423090d529f3eb845b55774b1ff4 phison is an ATA driver, not a classic IDE driver, so fix the Kconfig file so that it will build. drivers/staging/phison/phison.c:43: error: implicit declaration of function 'ATA_BMDMA_SHT' drivers/staging/phison/phison.c:43: error: initializer element is not constant drivers/staging/phison/phison.c:43: error: (near initialization for 'phison_sht.module') drivers/staging/phison/phison.c:47: error: 'ata_bmdma_port_ops' undeclared here (not in a function) drivers/staging/phison/phison.c:65: error: implicit declaration of function 'ata_pci_sff_init_one' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
phison is an ATA driver, not a classic IDE driver, so fix the Kconfig file
so that it will build.

drivers/staging/phison/phison.c:43: error: implicit declaration of function 'ATA_BMDMA_SHT'
drivers/staging/phison/phison.c:43: error: initializer element is not constant
drivers/staging/phison/phison.c:43: error: (near initialization for 'phison_sht.module')
drivers/staging/phison/phison.c:47: error: 'ata_bmdma_port_ops' undeclared here (not in a function)
drivers/staging/phison/phison.c:65: error: implicit declaration of function 'ata_pci_sff_init_one'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Staging: phison: add driver to the build system 2009-04-03T21:53:40+00:00 Greg Kroah-Hartman gregkh@suse.de 2009-02-09T21:02:35+00:00 301df5dce43124e926341665182a14f13a24ff96 Cc: Evan Ko <evan_ko@phison.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
Cc: Evan Ko <evan_ko@phison.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Staging: phison: port code to work properly with latest libata 2009-04-03T21:53:40+00:00 Greg Kroah-Hartman gregkh@suse.de 2009-02-12T21:37:51+00:00 76d86df9c4947fd49f320834b6d618c234ce0ed7 This brings the driver up to modern times so that it can build and run properly with the in-tree libata code. Cc: Evan Ko <evan_ko@phison.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
This brings the driver up to modern times so that it can build and run
properly with the in-tree libata code.

Cc: Evan Ko <evan_ko@phison.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Staging: phison: fix up checkpatch and other formatting issues 2009-04-03T21:53:40+00:00 Greg Kroah-Hartman gregkh@suse.de 2009-02-12T21:36:54+00:00 33210206b69db88925a318b053ab7aa9693c097f Minor touchups to fix up the coding style issues in the phison driver. Cc: Evan Ko <evan_ko@phison.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
Minor touchups to fix up the coding style issues in the phison driver.

Cc: Evan Ko <evan_ko@phison.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Staging: add phison ATA driver to the tree 2009-04-03T21:53:40+00:00 Evan Ko evan_ko@phison.com 2009-02-09T21:02:35+00:00 cfc2f947f849d75dfb1bff780dfee023c2e5a390 It doesn't build properly yet as it is against an older kernel version. That will be fixed up in patches following this. From: Evan Ko <evan_ko@phison.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
It doesn't build properly yet as it is against an older kernel version.
That will be fixed up in patches following this.

From: Evan Ko <evan_ko@phison.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>