---

yaml
---
r: 131743
b: refs/heads/master
c: e07a4b9
h: refs/heads/master
i:
  131741: b687105
  131739: 56babff
  131735: cd3611e
  131727: 39c82b4
  131711: 0beeec3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d
+refs/heads/master: e07a4b9217d1e97d2f3a62b6b070efdc61212110

trunk/arch/arm/mach-rpc/riscpc.c

@@ -19,7 +19,6 @@
 #include <linux/serial_8250.h>
 #include <linux/ata_platform.h>
 #include <linux/io.h>
-#include <linux/i2c.h>
 
 #include <asm/elf.h>
 #include <asm/mach-types.h>
@@ -202,13 +201,8 @@ static struct platform_device *devs[] __initdata = {
 	&pata_device,
 };
 
-static struct i2c_board_info i2c_rtc = {
-	I2C_BOARD_INFO("pcf8583", 0x50)
-};
-
 static int __init rpc_init(void)
 {
-	i2c_register_board_info(0, &i2c_rtc, 1);
 	return platform_add_devices(devs, ARRAY_SIZE(devs));
 }
 

trunk/drivers/i2c/busses/i2c-acorn.c

@@ -79,19 +79,18 @@ static struct i2c_algo_bit_data ioc_data = {
 	.getsda		= ioc_getsda,
 	.getscl		= ioc_getscl,
 	.udelay		= 80,
-	.timeout	= HZ,
+	.timeout	= 100
 };
 
 static struct i2c_adapter ioc_ops = {
-	.nr			= 0,
 	.algo_data		= &ioc_data,
 };
 
 static int __init i2c_ioc_init(void)
 {
 	force_ones = FORCE_ONES | SCL | SDA;
 
-	return i2c_bit_add_numbered_bus(&ioc_ops);
+	return i2c_bit_add_bus(&ioc_ops);
 }
 
 module_init(i2c_ioc_init);

trunk/drivers/i2c/busses/i2c-amd8111.c

@@ -72,7 +72,7 @@ static unsigned int amd_ec_wait_write(struct amd_smbus *smbus)
 {
 	int timeout = 500;
 
-	while ((inb(smbus->base + AMD_EC_SC) & AMD_EC_SC_IBF) && --timeout)
+	while (timeout-- && (inb(smbus->base + AMD_EC_SC) & AMD_EC_SC_IBF))
 		udelay(1);
 
 	if (!timeout) {
@@ -88,7 +88,7 @@ static unsigned int amd_ec_wait_read(struct amd_smbus *smbus)
 {
 	int timeout = 500;
 
-	while ((~inb(smbus->base + AMD_EC_SC) & AMD_EC_SC_OBF) && --timeout)
+	while (timeout-- && (~inb(smbus->base + AMD_EC_SC) & AMD_EC_SC_OBF))
 		udelay(1);
 
 	if (!timeout) {

trunk/drivers/i2c/busses/i2c-ixp2000.c

@@ -114,7 +114,7 @@ static int ixp2000_i2c_probe(struct platform_device *plat_dev)
 	drv_data->algo_data.getsda = ixp2000_bit_getsda;
 	drv_data->algo_data.getscl = ixp2000_bit_getscl;
 	drv_data->algo_data.udelay = 6;
-	drv_data->algo_data.timeout = HZ;
+	drv_data->algo_data.timeout = 100;
 
 	strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name,
 		sizeof(drv_data->adapter.name));

trunk/drivers/i2c/busses/i2c-pxa.c

@@ -644,7 +644,7 @@ static int i2c_pxa_do_pio_xfer(struct pxa_i2c *i2c,
 
 	i2c_pxa_start_message(i2c);
 
-	while (i2c->msg_num > 0 && --timeout) {
+	while (timeout-- && i2c->msg_num > 0) {
 		i2c_pxa_handler(0, i2c);
 		udelay(10);
 	}

trunk/drivers/i2c/busses/scx200_i2c.c

@@ -76,7 +76,7 @@ static struct i2c_algo_bit_data scx200_i2c_data = {
 	.getsda		= scx200_i2c_getsda,
 	.getscl		= scx200_i2c_getscl,
 	.udelay		= 10,
-	.timeout	= HZ,
+	.timeout	= 100,
 };
 
 static struct i2c_adapter scx200_i2c_ops = {

trunk/drivers/i2c/i2c-core.c

@@ -1831,8 +1831,7 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr,
 	case I2C_SMBUS_QUICK:
 		msg[0].len = 0;
 		/* Special case: The read/write field is used as data */
-		msg[0].flags = flags | (read_write == I2C_SMBUS_READ ?
-					I2C_M_RD : 0);
+		msg[0].flags = flags | (read_write==I2C_SMBUS_READ)?I2C_M_RD:0;
 		num = 1;
 		break;
 	case I2C_SMBUS_BYTE:

trunk/drivers/i2c/i2c-dev.c

@@ -35,7 +35,6 @@
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
 #include <linux/smp_lock.h>
-#include <linux/jiffies.h>
 #include <asm/uaccess.h>
 
 static struct i2c_driver i2cdev_driver;
@@ -423,10 +422,7 @@ static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		client->adapter->retries = arg;
 		break;
 	case I2C_TIMEOUT:
-		/* For historical reasons, user-space sets the timeout
-		 * value in units of 10 ms.
-		 */
-		client->adapter->timeout = msecs_to_jiffies(arg * 10);
+		client->adapter->timeout = arg;
 		break;
 	default:
 		/* NOTE:  returning a fault code here could cause trouble

trunk/drivers/ieee1394/dma.h

@@ -12,7 +12,6 @@
 
 #include <asm/types.h>
 
-struct file;
 struct pci_dev;
 struct scatterlist;
 struct vm_area_struct;

trunk/drivers/ieee1394/ieee1394_core.c

@@ -1314,7 +1314,6 @@ EXPORT_SYMBOL(hpsb_make_lock64packet);
 EXPORT_SYMBOL(hpsb_make_phypacket);
 EXPORT_SYMBOL(hpsb_read);
 EXPORT_SYMBOL(hpsb_write);
-EXPORT_SYMBOL(hpsb_lock);
 EXPORT_SYMBOL(hpsb_packet_success);
 
 /** highlevel.c **/

trunk/drivers/ieee1394/ieee1394_transactions.c

@@ -501,6 +501,8 @@ int hpsb_read(struct hpsb_host *host, nodeid_t node, unsigned int generation,
 	if (length == 0)
 		return -EINVAL;
 
+	BUG_ON(in_interrupt());	// We can't be called in an interrupt, yet
+
 	packet = hpsb_make_readpacket(host, node, addr, length);
 
 	if (!packet) {
@@ -548,6 +550,8 @@ int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation,
 	if (length == 0)
 		return -EINVAL;
 
+	BUG_ON(in_interrupt());	// We can't be called in an interrupt, yet
+
 	packet = hpsb_make_writepacket(host, node, addr, buffer, length);
 
 	if (!packet)
@@ -566,30 +570,3 @@ int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation,
 
 	return retval;
 }
-
-int hpsb_lock(struct hpsb_host *host, nodeid_t node, unsigned int generation,
-	      u64 addr, int extcode, quadlet_t *data, quadlet_t arg)
-{
-	struct hpsb_packet *packet;
-	int retval = 0;
-
-	packet = hpsb_make_lockpacket(host, node, addr, extcode, data, arg);
-	if (!packet)
-		return -ENOMEM;
-
-	packet->generation = generation;
-	retval = hpsb_send_packet_and_wait(packet);
-	if (retval < 0)
-		goto hpsb_lock_fail;
-
-	retval = hpsb_packet_success(packet);
-
-	if (retval == 0)
-		*data = packet->data[0];
-
-hpsb_lock_fail:
-	hpsb_free_tlabel(packet);
-	hpsb_free_packet(packet);
-
-	return retval;
-}

trunk/drivers/ieee1394/ieee1394_transactions.h

@@ -30,8 +30,6 @@ int hpsb_read(struct hpsb_host *host, nodeid_t node, unsigned int generation,
 	      u64 addr, quadlet_t *buffer, size_t length);
 int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation,
 	       u64 addr, quadlet_t *buffer, size_t length);
-int hpsb_lock(struct hpsb_host *host, nodeid_t node, unsigned int generation,
-	      u64 addr, int extcode, quadlet_t *data, quadlet_t arg);
 
 #ifdef HPSB_DEBUG_TLABELS
 extern spinlock_t hpsb_tlabel_lock;

trunk/drivers/ieee1394/iso.h

@@ -13,7 +13,6 @@
 #define IEEE1394_ISO_H
 
 #include <linux/spinlock_types.h>
-#include <linux/wait.h>
 #include <asm/atomic.h>
 #include <asm/types.h>
 

trunk/drivers/ieee1394/nodemgr.c

@@ -971,9 +971,6 @@ static struct unit_directory *nodemgr_process_unit_directory
 	ud->ud_kv = ud_kv;
 	ud->id = (*id)++;
 
-	/* inherit vendor_id from root directory if none exists in unit dir */
-	ud->vendor_id = ne->vendor_id;
-
 	csr1212_for_each_dir_entry(ne->csr, kv, ud_kv, dentry) {
 		switch (kv->key.id) {
 		case CSR1212_KV_ID_VENDOR:
@@ -1268,8 +1265,7 @@ static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr,
 		csr1212_destroy_csr(csr);
 	}
 
-	/* Finally, mark the node current */
-	smp_wmb();
+	/* Mark the node current */
 	ne->generation = generation;
 
 	if (ne->in_limbo) {
@@ -1802,7 +1798,7 @@ void hpsb_node_fill_packet(struct node_entry *ne, struct hpsb_packet *packet)
 {
 	packet->host = ne->host;
 	packet->generation = ne->generation;
-	smp_rmb();
+	barrier();
 	packet->node_id = ne->nodeid;
 }
 
@@ -1811,7 +1807,7 @@ int hpsb_node_write(struct node_entry *ne, u64 addr,
 {
 	unsigned int generation = ne->generation;
 
-	smp_rmb();
+	barrier();
 	return hpsb_write(ne->host, ne->nodeid, generation,
 			  addr, buffer, length);
 }

trunk/drivers/ieee1394/nodemgr.h

@@ -21,11 +21,9 @@
 #define _IEEE1394_NODEMGR_H
 
 #include <linux/device.h>
-#include <asm/system.h>
 #include <asm/types.h>
 
 #include "ieee1394_core.h"
-#include "ieee1394_transactions.h"
 #include "ieee1394_types.h"
 
 struct csr1212_csr;
@@ -156,22 +154,6 @@ static inline int hpsb_node_entry_valid(struct node_entry *ne)
 void hpsb_node_fill_packet(struct node_entry *ne, struct hpsb_packet *packet);
 int hpsb_node_write(struct node_entry *ne, u64 addr,
 		    quadlet_t *buffer, size_t length);
-static inline int hpsb_node_read(struct node_entry *ne, u64 addr,
-				 quadlet_t *buffer, size_t length)
-{
-	unsigned int g = ne->generation;
-
-	smp_rmb();
-	return hpsb_read(ne->host, ne->nodeid, g, addr, buffer, length);
-}
-static inline int hpsb_node_lock(struct node_entry *ne, u64 addr, int extcode,
-				 quadlet_t *buffer, quadlet_t arg)
-{
-	unsigned int g = ne->generation;
-
-	smp_rmb();
-	return hpsb_lock(ne->host, ne->nodeid, g, addr, extcode, buffer, arg);
-}
 int nodemgr_for_each_host(void *data, int (*cb)(struct hpsb_host *, void *));
 
 int init_ieee1394_nodemgr(void);

trunk/drivers/media/dvb/Kconfig

@@ -51,10 +51,6 @@ comment "Supported SDMC DM1105 Adapters"
 	depends on DVB_CORE && PCI && I2C
 source "drivers/media/dvb/dm1105/Kconfig"
 
-comment "Supported FireWire (IEEE 1394) Adapters"
-	depends on DVB_CORE && IEEE1394
-source "drivers/media/dvb/firewire/Kconfig"
-
 comment "Supported DVB Frontends"
 	depends on DVB_CORE
 source "drivers/media/dvb/frontends/Kconfig"

trunk/drivers/media/dvb/Makefile

@@ -3,5 +3,3 @@
 #
 
 obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dvb-usb/ pluto2/ siano/ dm1105/
-
-obj-$(CONFIG_DVB_FIREDTV)	+= firewire/