From patchwork Mon Aug 21 22:28:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 9913919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CA9BD603FA for ; Mon, 21 Aug 2017 22:28:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB4A4286AA for ; Mon, 21 Aug 2017 22:28:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A036B286C5; Mon, 21 Aug 2017 22:28:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3064F286AA for ; Mon, 21 Aug 2017 22:28:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754430AbdHUW2v (ORCPT ); Mon, 21 Aug 2017 18:28:51 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:42954 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754198AbdHUW2t (ORCPT ); Mon, 21 Aug 2017 18:28:49 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 6F21C463CD; Tue, 22 Aug 2017 00:28:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id z5mzJoFH8df1; Tue, 22 Aug 2017 00:28:46 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, Hauke Mehrtens Subject: [PATCH 17/21] patches: backport the probe_new for i2c drivers Date: Tue, 22 Aug 2017 00:28:13 +0200 Message-Id: <20170821222817.17376-18-hauke@hauke-m.de> In-Reply-To: <20170821222817.17376-1-hauke@hauke-m.de> References: <20170821222817.17376-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I2C got a new probe function which does not take the struct i2c_device_id any more, backport this to older kernel versions with a spatch. Signed-off-by: Hauke Mehrtens --- patches/0080-i2c-proble-new.cocci | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 patches/0080-i2c-proble-new.cocci diff --git a/patches/0080-i2c-proble-new.cocci b/patches/0080-i2c-proble-new.cocci new file mode 100644 index 00000000..35580aca --- /dev/null +++ b/patches/0080-i2c-proble-new.cocci @@ -0,0 +1,25 @@ +@r@ +identifier OPS; +identifier i2c_probe; +fresh identifier i2c_probe_wrap = "bp_" ## i2c_probe; +position p; +@@ +struct i2c_driver OPS@p = { ++#if LINUX_VERSION_IS_GEQ(4,10,0) + .probe_new = i2c_probe, ++#else ++ .probe = i2c_probe_wrap, ++#endif +}; + +@@ +identifier r.i2c_probe_wrap; +identifier r.i2c_probe; +@@ +int i2c_probe(...) {...} ++#if LINUX_VERSION_IS_LESS(4,10,0) ++static int i2c_probe_wrap(struct i2c_client *client, const struct i2c_device_id *id) ++{ ++ return i2c_probe(client); ++} ++#endif