From patchwork Mon Feb 25 15:51:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Shearman X-Patchwork-Id: 1047819 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Y+CyeLWY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 447RJD66ydz9s71 for ; Tue, 26 Feb 2019 02:51:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727661AbfBYPvW (ORCPT ); Mon, 25 Feb 2019 10:51:22 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:40480 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727657AbfBYPvW (ORCPT ); Mon, 25 Feb 2019 10:51:22 -0500 Received: by mail-wm1-f67.google.com with SMTP id t15so8499037wmi.5 for ; Mon, 25 Feb 2019 07:51:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5OFNwrJjdc8dUESA2VVU5h1vEVOirnaqlDtR0cU/cmg=; b=Y+CyeLWYGZrolrrrHnDCluBSuOyyZNC5B7qo73WpbVwl539FEBr7tMNKG6BQEMLTnc hIwDneQm2a0Nun3XtXSnLPU4ZFVcx6tprrnBw3DMXC+QTIlt5iRfIgsxrIyOcjQ8v5XX rseKGf0VUhm4Jx9+gT6BjE0Tew/jdOT80fpNMOLqtT6oWlWb+N2TJtEg2k8yBodP9Wfy aZByTVwFLEW4zrRKv3MiqwwCYd9CduBP+uHbuS/JLu5X7urUCQQEF8zeofxDXSlyxYlu ENdJlGcu7OAKcgKJcUuUU/rlvVEzIrEr6Z1ndaXXVraI6NKXeZ9+froWtqRqkGpLRVy9 jvqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5OFNwrJjdc8dUESA2VVU5h1vEVOirnaqlDtR0cU/cmg=; b=RzRFspI2RYm/bpc1DLSuuj6k7OBKDjkjMIS15K7IqNgjPRyT79VEkYwMQwuiMhzpht G/PVwhNE27ctVmFlbiPQNgoAO3hUcmEhKtBllQgjVkUSOWd7cGnsRMMtTJZ6x9zFMmjY +ZMRBGTnXdzxeTC0Z51Brvhlodb5cO9fUQNjEQ2ztmabC08MJOE5BbBvufJE6mzveaHT i8L6lbzL2F0WeKXarrLthzVgEM3RlRdUDf9YXYtU6gYfUghMK1GRxMzj/m8jkSrG7S2k WEoK/DXNPLgyMVwXt8HH3pct8q4Ld8W3TG+SvLS24Al/sRAznY7PrS23j75CBamS3HeD lV4Q== X-Gm-Message-State: AHQUAub5dZSXlnQpXdVLJrUrvs0f8rocI4c7pM7o2RW1GDhYdc/WkRrN u80I4sgrgXLV6T5IBMh1PIaQ6kgL030= X-Google-Smtp-Source: AHgI3IbVpxrwyMIvZkEjPid78R76Ktm5TbUdGS0QR6IYbdu8uhhw7+vlm+n1D1BIgIhGzW5XAJwfHw== X-Received: by 2002:a1c:7c10:: with SMTP id x16mr10849076wmc.98.1551109880168; Mon, 25 Feb 2019 07:51:20 -0800 (PST) Received: from uks1.vyatta.net ([137.221.143.78]) by smtp.gmail.com with ESMTPSA id s3sm6257109wmj.23.2019.02.25.07.51.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 07:51:19 -0800 (PST) From: Robert Shearman To: Peter Rosin , Guenter Roeck Cc: linux-i2c@vger.kernel.org, Robert Shearman Subject: [PATCH v3 2/3] i2c: mux: pca9541: remove support for unused platform data Date: Mon, 25 Feb 2019 15:51:04 +0000 Message-Id: <20190225155105.19378-3-robertshearman@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225155105.19378-1-robertshearman@gmail.com> References: <20190225155105.19378-1-robertshearman@gmail.com> MIME-Version: 1.0 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org From: Robert Shearman There are no in-tree users of the platform data, so remove it to simplify the code slightly. Remove the now unused pca954x.h platform data header. Signed-off-by: Robert Shearman --- drivers/i2c/muxes/i2c-mux-pca9541.c | 4 --- include/linux/platform_data/pca954x.h | 48 --------------------------- 2 files changed, 52 deletions(-) delete mode 100644 include/linux/platform_data/pca954x.h diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c index 9e75d6b9140b..aea3c4ab70f7 100644 --- a/drivers/i2c/muxes/i2c-mux-pca9541.c +++ b/drivers/i2c/muxes/i2c-mux-pca9541.c @@ -22,7 +22,6 @@ #include #include #include -#include #include /* @@ -287,7 +286,6 @@ static int pca9541_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct i2c_adapter *adap = client->adapter; - struct pca954x_platform_data *pdata = dev_get_platdata(&client->dev); struct i2c_mux_core *muxc; struct pca9541 *data; int force; @@ -307,8 +305,6 @@ static int pca9541_probe(struct i2c_client *client, /* Create mux adapter */ force = 0; - if (pdata) - force = pdata->modes[0].adap_id; muxc = i2c_mux_alloc(adap, &client->dev, 1, sizeof(*data), I2C_MUX_ARBITRATOR, pca9541_select_chan, pca9541_release_chan); diff --git a/include/linux/platform_data/pca954x.h b/include/linux/platform_data/pca954x.h deleted file mode 100644 index 1712677d5904..000000000000 --- a/include/linux/platform_data/pca954x.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * - * pca954x.h - I2C multiplexer/switch support - * - * Copyright (c) 2008-2009 Rodolfo Giometti - * Copyright (c) 2008-2009 Eurotech S.p.A. - * Michael Lawnick - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -#ifndef _LINUX_I2C_PCA954X_H -#define _LINUX_I2C_PCA954X_H - -/* Platform data for the PCA954x I2C multiplexers */ - -/* Per channel initialisation data: - * @adap_id: bus number for the adapter. 0 = don't care - * @deselect_on_exit: set this entry to 1, if your H/W needs deselection - * of this channel after transaction. - * - */ -struct pca954x_platform_mode { - int adap_id; - unsigned int deselect_on_exit:1; - unsigned int class; -}; - -/* Per mux/switch data, used with i2c_register_board_info */ -struct pca954x_platform_data { - struct pca954x_platform_mode *modes; - int num_modes; -}; - -#endif /* _LINUX_I2C_PCA954X_H */