--- v14
+++ v11
@@ -2,7 +2,7 @@
 IXP465. The basic clock operations and an external trigger are implemented.
 
 Signed-off-by: Richard Cochran <richard.cochran-3mrvs1K0uXizZXS1Dc/lvw@public.gmane.org>
-Acked-by: John Stultz <john.stultz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+Acked-by: John Stultz <johnstul-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
 ---
  arch/arm/mach-ixp4xx/include/mach/ixp46x_ts.h |   78 ++++++
  drivers/net/arm/ixp4xx_eth.c                  |  192 ++++++++++++++-
@@ -98,7 +98,7 @@
 +
 +#endif
 diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
-index 9eb9b98..c56fcb6 100644
+index 9eb9b98..fa08c17 100644
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c
 @@ -30,9 +30,12 @@
@@ -142,7 +142,7 @@
 +	PTP_FILTER
 +};
 +
-+static int ixp_ptp_match(struct sk_buff *skb, u16 uid_hi, u32 uid_lo, u16 seq)
++static int match(struct sk_buff *skb, u16 uid_hi, u32 uid_lo, u16 seq)
 +{
 +	unsigned int type;
 +	u16 *hi, *id;
@@ -164,7 +164,7 @@
 +	return 0;
 +}
 +
-+static void ixp_rx_timestamp(struct port *port, struct sk_buff *skb)
++static void do_rx_timestamp(struct port *port, struct sk_buff *skb)
 +{
 +	struct skb_shared_hwtstamps *shhwtstamps;
 +	struct ixp46x_ts_regs *regs;
@@ -190,7 +190,7 @@
 +	uid = hi & 0xffff;
 +	seq = (hi >> 16) & 0xffff;
 +
-+	if (!ixp_ptp_match(skb, htons(uid), htonl(lo), htons(seq)))
++	if (!match(skb, htons(uid), htonl(lo), htons(seq)))
 +		goto out;
 +
 +	lo = __raw_readl(&regs->channel[ch].rx_snap_lo);
@@ -206,7 +206,7 @@
 +	__raw_writel(RX_SNAPSHOT_LOCKED, &regs->channel[ch].ch_event);
 +}
 +
-+static void ixp_tx_timestamp(struct port *port, struct sk_buff *skb)
++static void do_tx_timestamp(struct port *port, struct sk_buff *skb)
 +{
 +	struct skb_shared_hwtstamps shhwtstamps;
 +	struct ixp46x_ts_regs *regs;
@@ -308,7 +308,7 @@
  
  		debug_pkt(dev, "eth_poll", skb->data, skb->len);
  
-+		ixp_rx_timestamp(port, skb);
++		do_rx_timestamp(port, skb);
  		skb->protocol = eth_type_trans(skb, dev);
  		dev->stats.rx_packets++;
  		dev->stats.rx_bytes += skb->len;
@@ -333,7 +333,7 @@
  	printk(KERN_DEBUG "%s: eth_xmit end\n", dev->name);
  #endif
 +
-+	ixp_tx_timestamp(port, skb);
++	do_tx_timestamp(port, skb);
 +	skb_tx_timestamp(skb);
 +
 +#ifndef __ARMEB__
@@ -397,7 +397,7 @@
 +obj-$(CONFIG_PTP_1588_CLOCK_IXP46X)	+= ptp_ixp46x.o
 diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c
 new file mode 100644
-index 0000000..803d665
+index 0000000..e28b416
 --- /dev/null
 +++ b/drivers/ptp/ptp_ixp46x.c
 @@ -0,0 +1,332 @@
@@ -454,7 +454,7 @@
 + * Register access functions
 + */
 +
-+static u64 ixp_systime_read(struct ixp46x_ts_regs *regs)
++static u64 sys_time_read(struct ixp46x_ts_regs *regs)
 +{
 +	u64 ns;
 +	u32 lo, hi;
@@ -469,7 +469,7 @@
 +	return ns;
 +}
 +
-+static void ixp_systime_write(struct ixp46x_ts_regs *regs, u64 ns)
++static void sys_time_write(struct ixp46x_ts_regs *regs, u64 ns)
 +{
 +	u32 hi, lo;
 +
@@ -569,9 +569,9 @@
 +
 +	spin_lock_irqsave(&register_lock, flags);
 +
-+	now = ixp_systime_read(regs);
++	now = sys_time_read(regs);
 +	now += delta;
-+	ixp_systime_write(regs, now);
++	sys_time_write(regs, now);
 +
 +	spin_unlock_irqrestore(&register_lock, flags);
 +
@@ -588,7 +588,7 @@
 +
 +	spin_lock_irqsave(&register_lock, flags);
 +
-+	ns = ixp_systime_read(regs);
++	ns = sys_time_read(regs);
 +
 +	spin_unlock_irqrestore(&register_lock, flags);
 +
@@ -610,7 +610,7 @@
 +
 +	spin_lock_irqsave(&register_lock, flags);
 +
-+	ixp_systime_write(regs, ns);
++	sys_time_write(regs, ns);
 +
 +	spin_unlock_irqrestore(&register_lock, flags);
 +
@@ -670,7 +670,7 @@
 +	if (NO_IRQ == irq)
 +		return NO_IRQ;
 +
-+	if (irq_set_irq_type(irq, IRQF_TRIGGER_FALLING)) {
++	if (set_irq_type(irq, IRQF_TRIGGER_FALLING)) {
 +		pr_err("cannot set trigger type for irq %d\n", irq);
 +		return NO_IRQ;
 +	}
@@ -695,7 +695,7 @@
 +	if (!cpu_is_ixp46x())
 +		return -ENODEV;
 +
-+	ixp_clock.regs =
++	ixp_clock.regs = 
 +		(struct ixp46x_ts_regs __iomem *) IXP4XX_TIMESYNC_BASE_VIRT;
 +
 +	ixp_clock.caps = ptp_ixp_caps;