From patchwork Tue Apr 23 05:42:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 238759 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B336C2C015D for ; Tue, 23 Apr 2013 15:50:47 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755002Ab3DWFuf (ORCPT ); Tue, 23 Apr 2013 01:50:35 -0400 Received: from mail-ea0-f181.google.com ([209.85.215.181]:63639 "EHLO mail-ea0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754956Ab3DWFue (ORCPT ); Tue, 23 Apr 2013 01:50:34 -0400 Received: by mail-ea0-f181.google.com with SMTP id a11so68570eae.12 for ; Mon, 22 Apr 2013 22:50:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=CDxKV4d0cmXJQQHiktGcoWn0kUH6vAnoaOGtIaJsKxU=; b=svucZoaH4X6W1RY3R9ipePETsWSkBYVjqDqbiWBGebl/RrXWNlrnnzlmDgervsr5NN wzfOLUI/lLTFeKfI9byVkliYw/PBm2ijXzra7NzOCp1byFHuEKNkG0Z+7p8h6LklmxTQ +FyvRBqZUfvg5mSwZb5O3fdaqCTqiIkpvWmeP5Zh9wRUk8MblQ8IotmePqMoNhgt2qxz sIyqMQ38zHEXAalvhUHtb0xFTTQkTg1ssf3vL4KelWFzJfAA+oxf479GalFC83679Uow snph5uEh6602Gsgo5SQ4P5O/f4GrIoHCfCrCV2lVxanhhnA6w4dtzKzeZ+2tcMw/2eHl tq+Q== X-Received: by 10.14.177.197 with SMTP id d45mr26578798eem.9.1366695747644; Mon, 22 Apr 2013 22:42:27 -0700 (PDT) Received: from localhost.localdomain (089144206123.atnat0015.highway.a1.net. [89.144.206.123]) by mx.google.com with ESMTPS id n48sm44553169eeg.12.2013.04.22.22.42.22 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 22 Apr 2013 22:42:26 -0700 (PDT) From: Richard Cochran To: Cc: David Miller , Subject: [PATCH net] gianfar: do not advertise any alarm capability. Date: Tue, 23 Apr 2013 07:42:16 +0200 Message-Id: <16ea6333aec82761aa7e2207b53cfbad85e9245b.1366695641.git.richardcochran@gmail.com> X-Mailer: git-send-email 1.7.2.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org An early draft of the PHC patch series included an alarm in the gianfar driver. During the review process, the alarm code was dropped, but the capability removal was overlooked. This patch fixes the issue by advertising zero alarms. This patch should be applied to every 3.x stable kernel. Signed-off-by: Richard Cochran Reported-by: Chris LaRocque Cc: --- drivers/net/ethernet/freescale/gianfar_ptp.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c index 2e5daee..a3f8a25 100644 --- a/drivers/net/ethernet/freescale/gianfar_ptp.c +++ b/drivers/net/ethernet/freescale/gianfar_ptp.c @@ -127,7 +127,6 @@ struct gianfar_ptp_registers { #define DRIVER "gianfar_ptp" #define DEFAULT_CKSEL 1 -#define N_ALARM 1 /* first alarm is used internally to reset fipers */ #define N_EXT_TS 2 #define REG_SIZE sizeof(struct gianfar_ptp_registers) @@ -410,7 +409,7 @@ static struct ptp_clock_info ptp_gianfar_caps = { .owner = THIS_MODULE, .name = "gianfar clock", .max_adj = 512000, - .n_alarm = N_ALARM, + .n_alarm = 0, .n_ext_ts = N_EXT_TS, .n_per_out = 0, .pps = 1,