---

yaml
---
r: 328068
b: refs/heads/master
c: b0041d1
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ddc7fe1cd1b2e0502f12b89c60b6e1ca66837dd
+refs/heads/master: b0041d1b8e73d419f4165c189af7c28aff3a02ec

trunk/Documentation/ABI/testing/sysfs-ptp

@@ -19,11 +19,7 @@ Date:		September 2010
 Contact:	Richard Cochran <richardcochran@gmail.com>
 Description:
 		This file contains the name of the PTP hardware clock
-		as a human readable string. The purpose of this
-		attribute is to provide the user with a "friendly
-		name" and to help distinguish PHY based devices from
-		MAC based ones. The string does not necessarily have
-		to be any kind of unique id.
+		as a human readable string.
 
 What:		/sys/class/ptp/ptpN/max_adjustment
 Date:		September 2010

trunk/Documentation/filesystems/nfs/nfsroot.txt

@@ -78,8 +78,7 @@ nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
 			flags		= hard, nointr, noposix, cto, ac
 
 
-ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>:
-   <dns0-ip>:<dns1-ip>
+ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
 
   This parameter tells the kernel how to configure IP addresses of devices
   and also how to set up the IP routing table. It was originally called
@@ -159,13 +158,6 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>:
 
                 Default: any
 
-  <dns0-ip>	IP address of first nameserver.
-		Value gets exported by /proc/net/pnp which is often linked
-		on embedded systems by /etc/resolv.conf.
-
-  <dns1-ip>	IP address of secound nameserver.
-		Same as above.
-
 
 nfsrootdebug
 

trunk/drivers/net/can/c_can/c_can.c

@@ -34,7 +34,6 @@
 #include <linux/if_ether.h>
 #include <linux/list.h>
 #include <linux/io.h>
-#include <linux/pm_runtime.h>
 
 #include <linux/can.h>
 #include <linux/can/dev.h>
@@ -46,9 +45,6 @@
 #define IF_ENUM_REG_LEN		11
 #define C_CAN_IFACE(reg, iface)	(C_CAN_IF1_##reg + (iface) * IF_ENUM_REG_LEN)
 
-/* control extension register D_CAN specific */
-#define CONTROL_EX_PDR		BIT(8)
-
 /* control register */
 #define CONTROL_TEST		BIT(7)
 #define CONTROL_CCE		BIT(6)
@@ -68,7 +64,6 @@
 #define TEST_BASIC		BIT(2)
 
 /* status register */
-#define STATUS_PDA		BIT(10)
 #define STATUS_BOFF		BIT(7)
 #define STATUS_EWARN		BIT(6)
 #define STATUS_EPASS		BIT(5)
@@ -168,9 +163,6 @@
 /* minimum timeout for checking BUSY status */
 #define MIN_TIMEOUT_VALUE	6
 
-/* Wait for ~1 sec for INIT bit */
-#define INIT_WAIT_MS		1000
-
 /* napi related */
 #define C_CAN_NAPI_WEIGHT	C_CAN_MSG_OBJ_RX_NUM
 
@@ -209,30 +201,6 @@ static const struct can_bittiming_const c_can_bittiming_const = {
 	.brp_inc = 1,
 };
 
-static inline void c_can_pm_runtime_enable(const struct c_can_priv *priv)
-{
-	if (priv->device)
-		pm_runtime_enable(priv->device);
-}
-
-static inline void c_can_pm_runtime_disable(const struct c_can_priv *priv)
-{
-	if (priv->device)
-		pm_runtime_disable(priv->device);
-}
-
-static inline void c_can_pm_runtime_get_sync(const struct c_can_priv *priv)
-{
-	if (priv->device)
-		pm_runtime_get_sync(priv->device);
-}
-
-static inline void c_can_pm_runtime_put_sync(const struct c_can_priv *priv)
-{
-	if (priv->device)
-		pm_runtime_put_sync(priv->device);
-}
-
 static inline int get_tx_next_msg_obj(const struct c_can_priv *priv)
 {
 	return (priv->tx_next & C_CAN_NEXT_MSG_OBJ_MASK) +
@@ -705,15 +673,11 @@ static int c_can_get_berr_counter(const struct net_device *dev,
 	unsigned int reg_err_counter;
 	struct c_can_priv *priv = netdev_priv(dev);
 
-	c_can_pm_runtime_get_sync(priv);
-
 	reg_err_counter = priv->read_reg(priv, C_CAN_ERR_CNT_REG);
 	bec->rxerr = (reg_err_counter & ERR_CNT_REC_MASK) >>
 				ERR_CNT_REC_SHIFT;
 	bec->txerr = reg_err_counter & ERR_CNT_TEC_MASK;
 
-	c_can_pm_runtime_put_sync(priv);
-
 	return 0;
 }
 
@@ -1089,13 +1053,11 @@ static int c_can_open(struct net_device *dev)
 	int err;
 	struct c_can_priv *priv = netdev_priv(dev);
 
-	c_can_pm_runtime_get_sync(priv);
-
 	/* open the can device */
 	err = open_candev(dev);
 	if (err) {
 		netdev_err(dev, "failed to open can device\n");
-		goto exit_open_fail;
+		return err;
 	}
 
 	/* register interrupt handler */
@@ -1117,8 +1079,6 @@ static int c_can_open(struct net_device *dev)
 
 exit_irq_fail:
 	close_candev(dev);
-exit_open_fail:
-	c_can_pm_runtime_put_sync(priv);
 	return err;
 }
 
@@ -1131,7 +1091,6 @@ static int c_can_close(struct net_device *dev)
 	c_can_stop(dev);
 	free_irq(dev->irq, dev);
 	close_candev(dev);
-	c_can_pm_runtime_put_sync(priv);
 
 	return 0;
 }
@@ -1160,77 +1119,6 @@ struct net_device *alloc_c_can_dev(void)
 }
 EXPORT_SYMBOL_GPL(alloc_c_can_dev);
 
-#ifdef CONFIG_PM
-int c_can_power_down(struct net_device *dev)
-{
-	u32 val;
-	unsigned long time_out;
-	struct c_can_priv *priv = netdev_priv(dev);
-
-	if (!(dev->flags & IFF_UP))
-		return 0;
-
-	WARN_ON(priv->type != BOSCH_D_CAN);
-
-	/* set PDR value so the device goes to power down mode */
-	val = priv->read_reg(priv, C_CAN_CTRL_EX_REG);
-	val |= CONTROL_EX_PDR;
-	priv->write_reg(priv, C_CAN_CTRL_EX_REG, val);
-
-	/* Wait for the PDA bit to get set */
-	time_out = jiffies + msecs_to_jiffies(INIT_WAIT_MS);
-	while (!(priv->read_reg(priv, C_CAN_STS_REG) & STATUS_PDA) &&
-				time_after(time_out, jiffies))
-		cpu_relax();
-
-	if (time_after(jiffies, time_out))
-		return -ETIMEDOUT;
-
-	c_can_stop(dev);
-
-	c_can_pm_runtime_put_sync(priv);
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(c_can_power_down);
-
-int c_can_power_up(struct net_device *dev)
-{
-	u32 val;
-	unsigned long time_out;
-	struct c_can_priv *priv = netdev_priv(dev);
-
-	if (!(dev->flags & IFF_UP))
-		return 0;
-
-	WARN_ON(priv->type != BOSCH_D_CAN);
-
-	c_can_pm_runtime_get_sync(priv);
-
-	/* Clear PDR and INIT bits */
-	val = priv->read_reg(priv, C_CAN_CTRL_EX_REG);
-	val &= ~CONTROL_EX_PDR;
-	priv->write_reg(priv, C_CAN_CTRL_EX_REG, val);
-	val = priv->read_reg(priv, C_CAN_CTRL_REG);
-	val &= ~CONTROL_INIT;
-	priv->write_reg(priv, C_CAN_CTRL_REG, val);
-
-	/* Wait for the PDA bit to get clear */
-	time_out = jiffies + msecs_to_jiffies(INIT_WAIT_MS);
-	while ((priv->read_reg(priv, C_CAN_STS_REG) & STATUS_PDA) &&
-				time_after(time_out, jiffies))
-		cpu_relax();
-
-	if (time_after(jiffies, time_out))
-		return -ETIMEDOUT;
-
-	c_can_start(dev);
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(c_can_power_up);
-#endif
-
 void free_c_can_dev(struct net_device *dev)
 {
 	free_candev(dev);
@@ -1245,19 +1133,10 @@ static const struct net_device_ops c_can_netdev_ops = {
 
 int register_c_can_dev(struct net_device *dev)
 {
-	struct c_can_priv *priv = netdev_priv(dev);
-	int err;
-
-	c_can_pm_runtime_enable(priv);
-
 	dev->flags |= IFF_ECHO;	/* we support local echo */
 	dev->netdev_ops = &c_can_netdev_ops;
 
-	err = register_candev(dev);
-	if (err)
-		c_can_pm_runtime_disable(priv);
-
-	return err;
+	return register_candev(dev);
 }
 EXPORT_SYMBOL_GPL(register_c_can_dev);
 
@@ -1269,8 +1148,6 @@ void unregister_c_can_dev(struct net_device *dev)
 	c_can_enable_all_interrupts(priv, DISABLE_ALL_INTERRUPTS);
 
 	unregister_candev(dev);
-
-	c_can_pm_runtime_disable(priv);
 }
 EXPORT_SYMBOL_GPL(unregister_c_can_dev);
 

trunk/drivers/net/can/c_can/c_can.h

@@ -24,7 +24,6 @@
 
 enum reg {
 	C_CAN_CTRL_REG = 0,
-	C_CAN_CTRL_EX_REG,
 	C_CAN_STS_REG,
 	C_CAN_ERR_CNT_REG,
 	C_CAN_BTR_REG,
@@ -105,7 +104,6 @@ static const u16 reg_map_c_can[] = {
 
 static const u16 reg_map_d_can[] = {
 	[C_CAN_CTRL_REG]	= 0x00,
-	[C_CAN_CTRL_EX_REG]	= 0x02,
 	[C_CAN_STS_REG]		= 0x04,
 	[C_CAN_ERR_CNT_REG]	= 0x08,
 	[C_CAN_BTR_REG]		= 0x0C,
@@ -145,17 +143,15 @@ static const u16 reg_map_d_can[] = {
 };
 
 enum c_can_dev_id {
-	BOSCH_C_CAN_PLATFORM,
-	BOSCH_C_CAN,
-	BOSCH_D_CAN,
+	C_CAN_DEVTYPE,
+	D_CAN_DEVTYPE,
 };
 
 /* c_can private data structure */
 struct c_can_priv {
 	struct can_priv can;	/* must be the first member */
 	struct napi_struct napi;
 	struct net_device *dev;
-	struct device *device;
 	int tx_object;
 	int current_status;
 	int last_status;
@@ -168,17 +164,11 @@ struct c_can_priv {
 	unsigned int tx_echo;
 	void *priv;		/* for board-specific data */
 	u16 irqstatus;
-	enum c_can_dev_id type;
 };
 
 struct net_device *alloc_c_can_dev(void);
 void free_c_can_dev(struct net_device *dev);
 int register_c_can_dev(struct net_device *dev);
 void unregister_c_can_dev(struct net_device *dev);
 
-#ifdef CONFIG_PM
-int c_can_power_up(struct net_device *dev);
-int c_can_power_down(struct net_device *dev);
-#endif
-
 #endif /* C_CAN_H */

trunk/drivers/net/can/c_can/c_can_pci.c

@@ -120,10 +120,10 @@ static int __devinit c_can_pci_probe(struct pci_dev *pdev,
 
 	/* Configure CAN type */
 	switch (c_can_pci_data->type) {
-	case BOSCH_C_CAN:
+	case C_CAN_DEVTYPE:
 		priv->regs = reg_map_c_can;
 		break;
-	case BOSCH_D_CAN:
+	case D_CAN_DEVTYPE:
 		priv->regs = reg_map_d_can;
 		priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
 		break;
@@ -192,7 +192,7 @@ static void __devexit c_can_pci_remove(struct pci_dev *pdev)
 }
 
 static struct c_can_pci_data c_can_sta2x11= {
-	.type = BOSCH_C_CAN,
+	.type = C_CAN_DEVTYPE,
 	.reg_align = C_CAN_REG_ALIGN_32,
 	.freq = 52000000, /* 52 Mhz */
 };