Commit c9976797 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (55 commits)
  ieee1394: sbp2: code formatting around work_struct stuff
  ieee1394: nodemgr: remove a kcalloc
  ieee1394: conditionally export ieee1394_bus_type
  ieee1394: Consolidate driver registering
  ieee1394: sbp2: convert from PCI DMA to generic DMA
  ieee1394: nodemgr: spaces to tabs
  ieee1394: nodemgr: fix deadlock in shutdown
  ieee1394: nodemgr: remove duplicate assignment
  sbp2: make 1bit bitfield unsigned
  ieee1394: schedule *_oui sysfs attributes for removal
  ieee1394: schedule unused symbol exports for removal
  ieee1394: dv1394: schedule for feature removal
  ieee1394: raw1394: defer feature removal of old isoch interface
  ieee1394: ohci1394: call PMac code in shutdown only for proper machines
  ieee1394: ohci1394: reformat PPC_PMAC platform code
  ieee1394: ohci1394: add PPC_PMAC platform code to driver probe
  ieee1394: sbp2: wrap two functions into one
  ieee1394: sbp2: update comment on things to do
  ieee1394: sbp2: use list_move_tail()
  ieee1394: sbp2: more concise names for types and variables
  ...
parents ea14fad0 ec9b7e10

Documentation/feature-removal-schedule.txt

+33 −5
Original line number Original line Diff line number Diff line
@@ -30,11 +30,39 @@ Who: Adrian Bunk <bunk@stusta.de> 
---------------------------

---------------------------





What:	raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN

What:	raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN

When:	November 2006

When:	June 2007

Why:	Deprecated in favour of the new ioctl-based rawiso interface, which is

Why:	Deprecated in favour of the more efficient and robust rawiso interface.

	more efficient.  You should really be using libraw1394 for raw1394

	Affected are applications which use the deprecated part of libraw1394

	access anyway.

	(raw1394_iso_write, raw1394_start_iso_write, raw1394_start_iso_rcv,

Who:	Jody McIntyre <scjody@modernduck.com>

	raw1394_stop_iso_rcv) or bypass	libraw1394.

Who:	Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de>



---------------------------



What:	dv1394 driver (CONFIG_IEEE1394_DV1394)

When:	June 2007

Why:	Replaced by raw1394 + userspace libraries, notably libiec61883.  This

	shift of application support has been indicated on www.linux1394.org

	and developers' mailinglists for quite some time.  Major applications

	have been converted, with the exception of ffmpeg and hence xine.

	Piped output of dvgrab2 is a partial equivalent to dv1394.

Who:	Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de>



---------------------------



What:	ieee1394 core's unused exports (CONFIG_IEEE1394_EXPORT_FULL_API)

When:	January 2007

Why:	There are no projects known to use these exported symbols, except

	dfg1394 (uses one symbol whose functionality is core-internal now).

Who:	Stefan Richter <stefanr@s5r6.in-berlin.de>



---------------------------



What:	ieee1394's *_oui sysfs attributes (CONFIG_IEEE1394_OUI_DB)

When:	January 2007

Files:	drivers/ieee1394/: oui.db, oui2c.sh

Why:	big size, little value

Who:	Stefan Richter <stefanr@s5r6.in-berlin.de>





---------------------------

---------------------------

drivers/ieee1394/Kconfig

+8 −18
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ config IEEE1394_VERBOSEDEBUG 
	  else says N.

	  else says N.





config IEEE1394_OUI_DB

config IEEE1394_OUI_DB

	bool "OUI Database built-in"

	bool "OUI Database built-in (deprecated)"

	depends on IEEE1394

	depends on IEEE1394

	help

	help

	  If you say Y here, then an OUI list (vendor unique ID's) will be

	  If you say Y here, then an OUI list (vendor unique ID's) will be
@@ -67,16 +67,11 @@ config IEEE1394_CONFIG_ROM_IP1394 
	  eth1394 option below.

	  eth1394 option below.





config IEEE1394_EXPORT_FULL_API

config IEEE1394_EXPORT_FULL_API

	bool "Export all symbols of ieee1394's API"

	bool "Export all symbols of ieee1394's API (deprecated)"

	depends on IEEE1394

	depends on IEEE1394

	default n

	default n

	help

	help

	  Export all symbols of ieee1394's driver programming interface, even

	  This option will be removed soon.  Don't worry, say N.

	  those that are not currently used by the standard IEEE 1394 drivers.



	  This option does not affect the interface to userspace applications.

	  Say Y here if you want to compile externally developed drivers that

	  make extended use of ieee1394's API. It is otherwise safe to say N.





comment "Device Drivers"

comment "Device Drivers"

	depends on IEEE1394

	depends on IEEE1394
@@ -125,7 +120,7 @@ comment "SBP-2 support (for storage devices) requires SCSI" 




config IEEE1394_SBP2

config IEEE1394_SBP2

	tristate "SBP-2 support (Harddisks etc.)"

	tristate "SBP-2 support (Harddisks etc.)"

	depends on IEEE1394 && SCSI && (PCI || BROKEN)

	depends on IEEE1394 && SCSI

	help

	help

	  This option enables you to use SBP-2 devices connected to an IEEE

	  This option enables you to use SBP-2 devices connected to an IEEE

	  1394 bus.  SBP-2 devices include storage devices like harddisks and

	  1394 bus.  SBP-2 devices include storage devices like harddisks and
@@ -161,17 +156,12 @@ config IEEE1394_ETH1394 
	  MCAP, therefore multicast support is significantly limited.

	  MCAP, therefore multicast support is significantly limited.





config IEEE1394_DV1394

config IEEE1394_DV1394

	tristate "OHCI-DV I/O support"

	tristate "OHCI-DV I/O support (deprecated)"

	depends on IEEE1394 && IEEE1394_OHCI1394

	depends on IEEE1394 && IEEE1394_OHCI1394

	help

	help

	  This driver allows you to transmit and receive DV (digital video)

	  The dv1394 driver will be removed from Linux in a future release.

	  streams on an OHCI-1394 card using a simple frame-oriented

	  Its functionality is now provided by raw1394 together with libraries

	  interface.

	  such as libiec61883.



	  The user-space API for dv1394 is documented in dv1394.h.



	  To compile this driver as a module, say M here: the

	  module will be called dv1394.





config IEEE1394_RAWIO

config IEEE1394_RAWIO

	tristate "Raw IEEE1394 I/O support"

	tristate "Raw IEEE1394 I/O support"

drivers/ieee1394/Makefile

+4 −1
Original line number Original line Diff line number Diff line
@@ -3,8 +3,11 @@ 
#

#





ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \

ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \

		 highlevel.o csr.o nodemgr.o oui.o dma.o iso.o \

		 highlevel.o csr.o nodemgr.o dma.o iso.o \

		 csr1212.o config_roms.o

		 csr1212.o config_roms.o

ifdef CONFIG_IEEE1394_OUI_DB

ieee1394-objs += oui.o

endif





obj-$(CONFIG_IEEE1394) += ieee1394.o

obj-$(CONFIG_IEEE1394) += ieee1394.o

obj-$(CONFIG_IEEE1394_PCILYNX) += pcilynx.o

obj-$(CONFIG_IEEE1394_PCILYNX) += pcilynx.o

drivers/ieee1394/csr.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -158,12 +158,10 @@ static void host_reset(struct hpsb_host *host) 
 */

 */

static inline void calculate_expire(struct csr_control *csr)

static inline void calculate_expire(struct csr_control *csr)

{

{

	unsigned long usecs =

	unsigned int usecs = (csr->split_timeout_hi & 7) * 1000000 +

		(csr->split_timeout_hi & 0x07) * USEC_PER_SEC +

			     (csr->split_timeout_lo >> 19) * 125;

		(csr->split_timeout_lo >> 19) * 125L;



	csr->expire = usecs_to_jiffies(usecs > 100000L ? usecs : 100000L);





	csr->expire = usecs_to_jiffies(usecs > 100000 ? usecs : 100000);

	HPSB_VERBOSE("CSR: setting expire to %lu, HZ=%u", csr->expire, HZ);

	HPSB_VERBOSE("CSR: setting expire to %lu, HZ=%u", csr->expire, HZ);

}

}

drivers/ieee1394/dv1394.c

+8 −16
Original line number Original line Diff line number Diff line
@@ -1536,28 +1536,21 @@ static ssize_t dv1394_read(struct file *file, char __user *buffer, size_t count 




static long dv1394_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

static long dv1394_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

{

	struct video_card *video;

	struct video_card *video = file_to_video_card(file);

	unsigned long flags;

	unsigned long flags;

	int ret = -EINVAL;

	int ret = -EINVAL;

	void __user *argp = (void __user *)arg;

	void __user *argp = (void __user *)arg;





	DECLARE_WAITQUEUE(wait, current);

	DECLARE_WAITQUEUE(wait, current);





	lock_kernel();

	video = file_to_video_card(file);



	/* serialize this to prevent multi-threaded mayhem */

	/* serialize this to prevent multi-threaded mayhem */

	if (file->f_flags & O_NONBLOCK) {

	if (file->f_flags & O_NONBLOCK) {

		if (!mutex_trylock(&video->mtx)) {

		if (!mutex_trylock(&video->mtx))

			unlock_kernel();

			return -EAGAIN;

			return -EAGAIN;

		}

	} else {

	} else {

		if (mutex_lock_interruptible(&video->mtx)) {

		if (mutex_lock_interruptible(&video->mtx))

			unlock_kernel();

			return -ERESTARTSYS;

			return -ERESTARTSYS;

	}

	}

	}





	switch(cmd)

	switch(cmd)

	{

	{
@@ -1780,7 +1773,6 @@ static long dv1394_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 




 out:

 out:

	mutex_unlock(&video->mtx);

	mutex_unlock(&video->mtx);

	unlock_kernel();

	return ret;

	return ret;

}

}
@@ -2188,12 +2180,8 @@ static struct ieee1394_device_id dv1394_id_table[] = { 
MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);

MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);





static struct hpsb_protocol_driver dv1394_driver = {

static struct hpsb_protocol_driver dv1394_driver = {

	.name		= "DV/1394 Driver",

	.id_table	= dv1394_id_table,

	.driver         = {

	.name		= "dv1394",

	.name		= "dv1394",

		.bus	= &ieee1394_bus_type,

	.id_table	= dv1394_id_table,

	},

};

};
@@ -2587,6 +2575,10 @@ static int __init dv1394_init_module(void) 
{

{

	int ret;

	int ret;





	printk(KERN_WARNING

	       "WARNING: The dv1394 driver is unsupported and will be removed "

	       "from Linux soon. Use raw1394 instead.\n");



	cdev_init(&dv1394_cdev, &dv1394_fops);

	cdev_init(&dv1394_cdev, &dv1394_fops);

	dv1394_cdev.owner = THIS_MODULE;

	dv1394_cdev.owner = THIS_MODULE;

	kobject_set_name(&dv1394_cdev.kobj, "dv1394");

	kobject_set_name(&dv1394_cdev.kobj, "dv1394");

CRA Git | Maintained and supported by SUSTech CRA and CCSE