From patchwork Thu Oct 11 07:50:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 148615 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp1810899lji; Thu, 11 Oct 2018 00:50:09 -0700 (PDT) X-Google-Smtp-Source: ACcGV632jKCYMcGHhr5TpAs8zrYIKWPyziyIbcVvaRwkmO3h2lSrPdqbQYWgIY+aI8AmtS996IRs X-Received: by 2002:a62:22c7:: with SMTP id p68-v6mr494464pfj.53.1539244209612; Thu, 11 Oct 2018 00:50:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539244209; cv=none; d=google.com; s=arc-20160816; b=pgNhcvlPfW1gv3DbLmUX7cO8Am7Wp+Y6vgVaTEtd7nwav0/QOtE88KRNbN+egX8D4B HAFCf4uWjSd8wv4U2VpAvaTq8EEGTyYr3QjoteSzBKqAgTA3FGEzbQd/ixiSKXQvR6vT i12IJ43QHLsCE+usTbeC797VIf7W4/zk8+GS+cXcTPgmhSh8HFQyG47wg6XFZZkPdw0Q CeeH2z9mMGxbjB+DZQVa1ZJjeJHH/3NLszPt1hfe/AdKg+f/4z70w0wETG5eOrKg81zY +Lkaes+awjXQiAtgNxg5TJGuBuHw7QSVr0BODRep98tfi8sqDXli3NKORV6ZTDd8S0B5 5U2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=d+r6AaqD7i6gai0NOAabiNGsa3WKSg/bimwJSP9PwtQ=; b=H8LxS1cy8vZvU3bP6V1Oc/e5Kd5ZwWTTVxKWrxs6AjW2luSv8O/qymzO4cC2mz4Sj8 OX+WpP+ZaFSIOrodK/TaR6/bTgbyIHp/xS2Zx5pqNB1fDU3GOg9ZhBF7dgeWI4i7838H hclf04T8wZoeVChMmM5ZRZAgw8Zi9AXI0AL7zj4bDxvJrxnKxAL6EoTsB05iEd/lSz+7 CSCO12RP55ioufjw9V6Og1mvow2APhZtQD8uouTlvx3/EOZy0vxVBFo2SODF+Im2Fwex 64LJe1oISSagTytdGwes85A804FXfC7oeS4hNRw7I3vzDz1lijTkdg/BzGCmgLQTk/v/ ZlVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Wk5I3evI; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d12-v6si26507939pga.81.2018.10.11.00.50.09; Thu, 11 Oct 2018 00:50:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Wk5I3evI; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727860AbeJKPQM (ORCPT + 5 others); Thu, 11 Oct 2018 11:16:12 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:44588 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726933AbeJKPQM (ORCPT ); Thu, 11 Oct 2018 11:16:12 -0400 Received: by mail-lj1-f195.google.com with SMTP id v6-v6so7295949ljc.11 for ; Thu, 11 Oct 2018 00:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=d+r6AaqD7i6gai0NOAabiNGsa3WKSg/bimwJSP9PwtQ=; b=Wk5I3evIXGwVABgTOupvwIUlSWJQHdTf9obvUh9iHN+X8jkseF3b5YPV/EzWLNQFHT feXXfRiY+Yvg66ZedP9lFd/KT4pbTp0tB7seRMp0tGODoe1zL/gBmTnXEWrMWGQWXEP0 7mrAamODc05dZySgaDOEBSWUU1aD5mp3k9GPc= 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:mime-version :content-transfer-encoding; bh=d+r6AaqD7i6gai0NOAabiNGsa3WKSg/bimwJSP9PwtQ=; b=c8Vrrf5ZlaxUfnHAuKRNK3fYu35Xi/M+smXK5wYG7b5r3YAE+x43O/XNPUi1xDUlv5 xW6V42V/zAYWSgfO47AukK8Dzv8OJxTphj4zYtMeQnm5dfKrY/IFanTR/ALEaZo1Gk/3 bkTkLpMNbjw3wIJ8TMzqKOPfOfRLQmptZ0T3UeB3mAJW0EQBRsXg/1SNR76EFxC+MDdE +SCw6avCmReVuDgujGW85HceB6d2/THtH7sD1tLTCp7wWSMP/e9F6mFUQ8YDYX5/R3dH VOke68PFymMinCkQS+1JWv0PgQudZgYWDwYmQs4406c5P9XDnQjcjrba/cuTUKyECdtt zxMw== X-Gm-Message-State: ABuFfojGkTV+eqUNSGsyh4Y0ha5YefdEEH44VB5IfIPAuD0H/jEtDXg5 FtUjdV3G34kdOY+CGKg2ToLbAAJaNr0= X-Received: by 2002:a2e:5686:: with SMTP id k6-v6mr391691lje.105.1539244206215; Thu, 11 Oct 2018 00:50:06 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id b29-v6sm5440007lfj.81.2018.10.11.00.50.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Oct 2018 00:50:05 -0700 (PDT) From: Linus Walleij To: linux-gpio@vger.kernel.org Cc: Linus Walleij , =?utf-8?b?UmFmYcWCIE1pxYJl?= =?utf-8?q?cki?= Subject: [PATCH v2] pinctrl: bcm: ns: Use uintptr_t for data Date: Thu, 11 Oct 2018 09:50:03 +0200 Message-Id: <20181011075003.8976-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Fix up a compiler error on 64bit architectures where pointers and integers differ in size. Cc: Rafał Miłecki Suggested-by: Arnd Bergmann Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Make a proper change including cast type. --- drivers/pinctrl/bcm/pinctrl-ns.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/drivers/pinctrl/bcm/pinctrl-ns.c b/drivers/pinctrl/bcm/pinctrl-ns.c index aedbb2813c50..925823a1e33f 100644 --- a/drivers/pinctrl/bcm/pinctrl-ns.c +++ b/drivers/pinctrl/bcm/pinctrl-ns.c @@ -20,7 +20,7 @@ struct ns_pinctrl { struct device *dev; - unsigned int chipset_flag; + uintptr_t chipset_flag; struct pinctrl_dev *pctldev; void __iomem *base; @@ -285,7 +285,7 @@ static int ns_pinctrl_probe(struct platform_device *pdev) of_id = of_match_device(ns_pinctrl_of_match_table, dev); if (!of_id) return -EINVAL; - ns_pinctrl->chipset_flag = (unsigned int)of_id->data; + ns_pinctrl->chipset_flag = (uintptr_t)of_id->data; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cru_gpio_control"); @@ -307,7 +307,7 @@ static int ns_pinctrl_probe(struct platform_device *pdev) for (i = 0, pin = (struct pinctrl_pin_desc *)&pctldesc->pins[0]; i < ARRAY_SIZE(ns_pinctrl_pins); i++) { const struct pinctrl_pin_desc *src = &ns_pinctrl_pins[i]; - unsigned int chipsets = (unsigned int)src->drv_data; + uintptr_t chipsets = (uintptr_t)src->drv_data; if (chipsets & ns_pinctrl->chipset_flag) { memcpy(pin++, src, sizeof(*src));