From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Lee Date: Wed, 9 Jun 2021 12:12:28 +0800 Subject: [PATCH v5 06/10] gpio: gpio-aspeed-sgpio: Add AST2400 and AST2500 platform data. In-Reply-To: <6f87ccf4-9b8f-4c67-84a1-e83a2ee5103b@www.fastmail.com> References: <20210608102547.4880-1-steven_lee@aspeedtech.com> <20210608102547.4880-7-steven_lee@aspeedtech.com> <6f87ccf4-9b8f-4c67-84a1-e83a2ee5103b@www.fastmail.com> Message-ID: <20210609041227.GB14839@aspeedtech.com> List-Id: To: linux-aspeed@lists.ozlabs.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit The 06/09/2021 08:55, Andrew Jeffery wrote: > > > On Tue, 8 Jun 2021, at 19:55, Steven Lee wrote: > > We use platform data to store GPIO pin mask and the max number of > > available GPIO pins for AST2600. > > Refactor driver to also add the platform data for AST2400/AST2500 and > > remove unused MAX_NR_HW_SGPIO and ASPEED_SGPIO_PINS_MASK macros. > > > > Signed-off-by: Steven Lee > > --- > > drivers/gpio/gpio-aspeed-sgpio.c | 34 +++++++++++--------------------- > > 1 file changed, 12 insertions(+), 22 deletions(-) > > > > diff --git a/drivers/gpio/gpio-aspeed-sgpio.c b/drivers/gpio/gpio-aspeed-sgpio.c > > index ea20a0127748..7d0a4f6fd9d1 100644 > > --- a/drivers/gpio/gpio-aspeed-sgpio.c > > +++ b/drivers/gpio/gpio-aspeed-sgpio.c > > @@ -17,21 +17,8 @@ > > #include > > #include > > > > -/* > > - * MAX_NR_HW_GPIO represents the number of actual hardware-supported GPIOs (ie, > > - * slots within the clocked serial GPIO data). Since each HW GPIO is both an > > - * input and an output, we provide MAX_NR_HW_GPIO * 2 lines on our gpiochip > > - * device. > > - * > > - * We use SGPIO_OUTPUT_OFFSET to define the split between the inputs and > > - * outputs; the inputs start at line 0, the outputs start at OUTPUT_OFFSET. > > - */ > > -#define MAX_NR_HW_SGPIO 80 > > -#define SGPIO_OUTPUT_OFFSET MAX_NR_HW_SGPIO > > - > > #define ASPEED_SGPIO_CTRL 0x54 > > > > -#define ASPEED_SGPIO_PINS_MASK GENMASK(9, 6) > > #define ASPEED_SGPIO_CLK_DIV_MASK GENMASK(31, 16) > > #define ASPEED_SGPIO_ENABLE BIT(0) > > #define ASPEED_SGPIO_PINS_SHIFT 6 > > @@ -484,6 +471,11 @@ static int aspeed_sgpio_setup_irqs(struct > > aspeed_sgpio *gpio, > > return 0; > > } > > > > +static const struct aspeed_sgpio_pdata ast2400_sgpio_pdata = { > > + .max_ngpios = 80, > > + .pin_mask = GENMASK(9, 6), > > +}; > > + > > static const struct aspeed_sgpio_pdata ast2600_sgpiom_128_pdata = { > > .max_ngpios = 128, > > .pin_mask = GENMASK(10, 6), > > @@ -495,8 +487,8 @@ static const struct aspeed_sgpio_pdata > > ast2600_sgpiom_80_pdata = { > > }; > > > > static const struct of_device_id aspeed_sgpio_of_table[] = { > > - { .compatible = "aspeed,ast2400-sgpio" }, > > - { .compatible = "aspeed,ast2500-sgpio" }, > > + { .compatible = "aspeed,ast2400-sgpio", .data = &ast2400_sgpio_pdata, > > }, > > + { .compatible = "aspeed,ast2500-sgpio", .data = &ast2400_sgpio_pdata, > > }, > > { .compatible = "aspeed,ast2600-sgpiom-128", .data = > > &ast2600_sgpiom_128_pdata, }, > > { .compatible = "aspeed,ast2600-sgpiom-80", .data = > > &ast2600_sgpiom_80_pdata, }, > > {} > > @@ -521,13 +513,11 @@ static int __init aspeed_sgpio_probe(struct > > platform_device *pdev) > > return PTR_ERR(gpio->base); > > > > pdata = device_get_match_data(&pdev->dev); > > - if (pdata) { > > - gpio->max_ngpios = pdata->max_ngpios; > > - pin_mask = pdata->pin_mask; > > - } else { > > - gpio->max_ngpios = MAX_NR_HW_SGPIO; > > - pin_mask = ASPEED_SGPIO_PINS_MASK; > > - } > > + if (!pdata) > > + return -EINVAL; > > + > > + gpio->max_ngpios = pdata->max_ngpios; > > + pin_mask = pdata->pin_mask; > > Hmm, okay, maybe just re-order the patches so this commit comes before the previous one. That way we don't immediately rip out this condition that we just introduced in the previous patch. > > I think I suggested squashing it into the previous patch, but with the removal of the comments and macros I think it's worth leaving it separate, just reordered. > I was wondering if I can squash patch-05 and patch-06 into one patch as this patch(patch-06) requires macros, structures, and functions that modified in the previous patch(patch-05). Thanks, Steven > Andrew From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A291C48BCD for ; Wed, 9 Jun 2021 04:13:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EE4EE61352 for ; Wed, 9 Jun 2021 04:13:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230428AbhFIEPf (ORCPT ); Wed, 9 Jun 2021 00:15:35 -0400 Received: from twspam01.aspeedtech.com ([211.20.114.71]:64258 "EHLO twspam01.aspeedtech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230466AbhFIEPf (ORCPT ); Wed, 9 Jun 2021 00:15:35 -0400 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 1593wd7F009056; Wed, 9 Jun 2021 11:58:39 +0800 (GMT-8) (envelope-from steven_lee@aspeedtech.com) Received: from aspeedtech.com (192.168.100.253) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 9 Jun 2021 12:12:31 +0800 Date: Wed, 9 Jun 2021 12:12:28 +0800 From: Steven Lee To: Andrew Jeffery CC: Linus Walleij , Bartosz Golaszewski , Rob Herring , Joel Stanley , "open list:GPIO SUBSYSTEM" , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , "moderated list:ARM/ASPEED MACHINE SUPPORT" , "moderated list:ARM/ASPEED MACHINE SUPPORT" , open list , Hongwei Zhang , Ryan Chen , Billy Tsai Subject: Re: [PATCH v5 06/10] gpio: gpio-aspeed-sgpio: Add AST2400 and AST2500 platform data. Message-ID: <20210609041227.GB14839@aspeedtech.com> References: <20210608102547.4880-1-steven_lee@aspeedtech.com> <20210608102547.4880-7-steven_lee@aspeedtech.com> <6f87ccf4-9b8f-4c67-84a1-e83a2ee5103b@www.fastmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline In-Reply-To: <6f87ccf4-9b8f-4c67-84a1-e83a2ee5103b@www.fastmail.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-Originating-IP: [192.168.100.253] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 1593wd7F009056 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The 06/09/2021 08:55, Andrew Jeffery wrote: > > > On Tue, 8 Jun 2021, at 19:55, Steven Lee wrote: > > We use platform data to store GPIO pin mask and the max number of > > available GPIO pins for AST2600. > > Refactor driver to also add the platform data for AST2400/AST2500 and > > remove unused MAX_NR_HW_SGPIO and ASPEED_SGPIO_PINS_MASK macros. > > > > Signed-off-by: Steven Lee > > --- > > drivers/gpio/gpio-aspeed-sgpio.c | 34 +++++++++++--------------------- > > 1 file changed, 12 insertions(+), 22 deletions(-) > > > > diff --git a/drivers/gpio/gpio-aspeed-sgpio.c b/drivers/gpio/gpio-aspeed-sgpio.c > > index ea20a0127748..7d0a4f6fd9d1 100644 > > --- a/drivers/gpio/gpio-aspeed-sgpio.c > > +++ b/drivers/gpio/gpio-aspeed-sgpio.c > > @@ -17,21 +17,8 @@ > > #include > > #include > > > > -/* > > - * MAX_NR_HW_GPIO represents the number of actual hardware-supported GPIOs (ie, > > - * slots within the clocked serial GPIO data). Since each HW GPIO is both an > > - * input and an output, we provide MAX_NR_HW_GPIO * 2 lines on our gpiochip > > - * device. > > - * > > - * We use SGPIO_OUTPUT_OFFSET to define the split between the inputs and > > - * outputs; the inputs start at line 0, the outputs start at OUTPUT_OFFSET. > > - */ > > -#define MAX_NR_HW_SGPIO 80 > > -#define SGPIO_OUTPUT_OFFSET MAX_NR_HW_SGPIO > > - > > #define ASPEED_SGPIO_CTRL 0x54 > > > > -#define ASPEED_SGPIO_PINS_MASK GENMASK(9, 6) > > #define ASPEED_SGPIO_CLK_DIV_MASK GENMASK(31, 16) > > #define ASPEED_SGPIO_ENABLE BIT(0) > > #define ASPEED_SGPIO_PINS_SHIFT 6 > > @@ -484,6 +471,11 @@ static int aspeed_sgpio_setup_irqs(struct > > aspeed_sgpio *gpio, > > return 0; > > } > > > > +static const struct aspeed_sgpio_pdata ast2400_sgpio_pdata = { > > + .max_ngpios = 80, > > + .pin_mask = GENMASK(9, 6), > > +}; > > + > > static const struct aspeed_sgpio_pdata ast2600_sgpiom_128_pdata = { > > .max_ngpios = 128, > > .pin_mask = GENMASK(10, 6), > > @@ -495,8 +487,8 @@ static const struct aspeed_sgpio_pdata > > ast2600_sgpiom_80_pdata = { > > }; > > > > static const struct of_device_id aspeed_sgpio_of_table[] = { > > - { .compatible = "aspeed,ast2400-sgpio" }, > > - { .compatible = "aspeed,ast2500-sgpio" }, > > + { .compatible = "aspeed,ast2400-sgpio", .data = &ast2400_sgpio_pdata, > > }, > > + { .compatible = "aspeed,ast2500-sgpio", .data = &ast2400_sgpio_pdata, > > }, > > { .compatible = "aspeed,ast2600-sgpiom-128", .data = > > &ast2600_sgpiom_128_pdata, }, > > { .compatible = "aspeed,ast2600-sgpiom-80", .data = > > &ast2600_sgpiom_80_pdata, }, > > {} > > @@ -521,13 +513,11 @@ static int __init aspeed_sgpio_probe(struct > > platform_device *pdev) > > return PTR_ERR(gpio->base); > > > > pdata = device_get_match_data(&pdev->dev); > > - if (pdata) { > > - gpio->max_ngpios = pdata->max_ngpios; > > - pin_mask = pdata->pin_mask; > > - } else { > > - gpio->max_ngpios = MAX_NR_HW_SGPIO; > > - pin_mask = ASPEED_SGPIO_PINS_MASK; > > - } > > + if (!pdata) > > + return -EINVAL; > > + > > + gpio->max_ngpios = pdata->max_ngpios; > > + pin_mask = pdata->pin_mask; > > Hmm, okay, maybe just re-order the patches so this commit comes before the previous one. That way we don't immediately rip out this condition that we just introduced in the previous patch. > > I think I suggested squashing it into the previous patch, but with the removal of the comments and macros I think it's worth leaving it separate, just reordered. > I was wondering if I can squash patch-05 and patch-06 into one patch as this patch(patch-06) requires macros, structures, and functions that modified in the previous patch(patch-05). Thanks, Steven > Andrew From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FD85C47095 for ; Wed, 9 Jun 2021 05:11:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2152A60BBB for ; Wed, 9 Jun 2021 05:11:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2152A60BBB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aspeedtech.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:CC:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MOgtzOYMG4qLYdGAQdJs13KUNBPYSfhBRUU/eRS+Tr4=; b=fXZro5Ew63V4c1 /MVQy1aAREA1UDjofJ2QRoFRXqavFZnBydZgE5vK5LYYkLQXDUIB2MqGVWl0Ob8mlXYZuhmfiOT04 bQ36hS4aW5Szku+GVWkZlTVRgs51+d5LrzytK5gHCh+i6nAkTboj0wgo7kcjRjLReEmZ0bCL2lOoO CdxETMxsjPQMNbmw0aefN1WEXRIdRgudKylD49TVePAcv6ZRr5dvDjR4iUxHRrpGJmXcg/fNW4Hjt CpYmIDAGEucwig+EQFHeXQnl4k2RkipckAwW4k3HJ/ElMfaOdPNZdsDYY+garEPF/83MZOuN/2Vp0 RbcT35+iru7mcLy4WLDg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqqTk-00Bk6X-Cl; Wed, 09 Jun 2021 05:10:12 +0000 Received: from casper.infradead.org ([90.155.50.34]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqqTi-00Bk6P-BD for linux-arm-kernel@bombadil.infradead.org; Wed, 09 Jun 2021 05:10:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:CC:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=NQu+FxyzoySF7LM+FjXcaFw3g62VxWTS4kD63VTK0Ts=; b=tUnI8kA1N6Y4+Mx90kxDUjDqTn IUYOWchWR208y+HXm9d98Y4LtjlklJvXKehmHMnSJgIVKTjWqyeS3YcsybdxtYU50N56zVJ2iwj18 1xv+iQmeUEGdGKu2rvd1Nl3nLIqOM8K5TpxV/Px6QRCBmc44GOLXvnHmLeKJ/oL7L37s6dE4dqvNT BZ7tk37gzFqyDkDhpapeGlS5RDYXDvjQrrymVaBdhp0zrqnldGRzdtuxQjBNRIaS22j7DulNtRAUY Ux/rjVUyJXGPEyKjyM1h9xRUhOXGD64/E26bc8f9+b4RHBIwab2Pp+hAoo12ka9+qtwd3UEbl2sM+ lW351RzA==; Received: from twspam01.aspeedtech.com ([211.20.114.71]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lqpad-00074a-Fs for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 04:13:24 +0000 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 1593wd7F009056; Wed, 9 Jun 2021 11:58:39 +0800 (GMT-8) (envelope-from steven_lee@aspeedtech.com) Received: from aspeedtech.com (192.168.100.253) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 9 Jun 2021 12:12:31 +0800 Date: Wed, 9 Jun 2021 12:12:28 +0800 From: Steven Lee To: Andrew Jeffery CC: Linus Walleij , Bartosz Golaszewski , Rob Herring , Joel Stanley , "open list:GPIO SUBSYSTEM" , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , "moderated list:ARM/ASPEED MACHINE SUPPORT" , "moderated list:ARM/ASPEED MACHINE SUPPORT" , open list , Hongwei Zhang , Ryan Chen , Billy Tsai Subject: Re: [PATCH v5 06/10] gpio: gpio-aspeed-sgpio: Add AST2400 and AST2500 platform data. Message-ID: <20210609041227.GB14839@aspeedtech.com> References: <20210608102547.4880-1-steven_lee@aspeedtech.com> <20210608102547.4880-7-steven_lee@aspeedtech.com> <6f87ccf4-9b8f-4c67-84a1-e83a2ee5103b@www.fastmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <6f87ccf4-9b8f-4c67-84a1-e83a2ee5103b@www.fastmail.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-Originating-IP: [192.168.100.253] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 1593wd7F009056 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_051322_004005_C046739D X-CRM114-Status: GOOD ( 25.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The 06/09/2021 08:55, Andrew Jeffery wrote: > > > On Tue, 8 Jun 2021, at 19:55, Steven Lee wrote: > > We use platform data to store GPIO pin mask and the max number of > > available GPIO pins for AST2600. > > Refactor driver to also add the platform data for AST2400/AST2500 and > > remove unused MAX_NR_HW_SGPIO and ASPEED_SGPIO_PINS_MASK macros. > > > > Signed-off-by: Steven Lee > > --- > > drivers/gpio/gpio-aspeed-sgpio.c | 34 +++++++++++--------------------- > > 1 file changed, 12 insertions(+), 22 deletions(-) > > > > diff --git a/drivers/gpio/gpio-aspeed-sgpio.c b/drivers/gpio/gpio-aspeed-sgpio.c > > index ea20a0127748..7d0a4f6fd9d1 100644 > > --- a/drivers/gpio/gpio-aspeed-sgpio.c > > +++ b/drivers/gpio/gpio-aspeed-sgpio.c > > @@ -17,21 +17,8 @@ > > #include > > #include > > > > -/* > > - * MAX_NR_HW_GPIO represents the number of actual hardware-supported GPIOs (ie, > > - * slots within the clocked serial GPIO data). Since each HW GPIO is both an > > - * input and an output, we provide MAX_NR_HW_GPIO * 2 lines on our gpiochip > > - * device. > > - * > > - * We use SGPIO_OUTPUT_OFFSET to define the split between the inputs and > > - * outputs; the inputs start at line 0, the outputs start at OUTPUT_OFFSET. > > - */ > > -#define MAX_NR_HW_SGPIO 80 > > -#define SGPIO_OUTPUT_OFFSET MAX_NR_HW_SGPIO > > - > > #define ASPEED_SGPIO_CTRL 0x54 > > > > -#define ASPEED_SGPIO_PINS_MASK GENMASK(9, 6) > > #define ASPEED_SGPIO_CLK_DIV_MASK GENMASK(31, 16) > > #define ASPEED_SGPIO_ENABLE BIT(0) > > #define ASPEED_SGPIO_PINS_SHIFT 6 > > @@ -484,6 +471,11 @@ static int aspeed_sgpio_setup_irqs(struct > > aspeed_sgpio *gpio, > > return 0; > > } > > > > +static const struct aspeed_sgpio_pdata ast2400_sgpio_pdata = { > > + .max_ngpios = 80, > > + .pin_mask = GENMASK(9, 6), > > +}; > > + > > static const struct aspeed_sgpio_pdata ast2600_sgpiom_128_pdata = { > > .max_ngpios = 128, > > .pin_mask = GENMASK(10, 6), > > @@ -495,8 +487,8 @@ static const struct aspeed_sgpio_pdata > > ast2600_sgpiom_80_pdata = { > > }; > > > > static const struct of_device_id aspeed_sgpio_of_table[] = { > > - { .compatible = "aspeed,ast2400-sgpio" }, > > - { .compatible = "aspeed,ast2500-sgpio" }, > > + { .compatible = "aspeed,ast2400-sgpio", .data = &ast2400_sgpio_pdata, > > }, > > + { .compatible = "aspeed,ast2500-sgpio", .data = &ast2400_sgpio_pdata, > > }, > > { .compatible = "aspeed,ast2600-sgpiom-128", .data = > > &ast2600_sgpiom_128_pdata, }, > > { .compatible = "aspeed,ast2600-sgpiom-80", .data = > > &ast2600_sgpiom_80_pdata, }, > > {} > > @@ -521,13 +513,11 @@ static int __init aspeed_sgpio_probe(struct > > platform_device *pdev) > > return PTR_ERR(gpio->base); > > > > pdata = device_get_match_data(&pdev->dev); > > - if (pdata) { > > - gpio->max_ngpios = pdata->max_ngpios; > > - pin_mask = pdata->pin_mask; > > - } else { > > - gpio->max_ngpios = MAX_NR_HW_SGPIO; > > - pin_mask = ASPEED_SGPIO_PINS_MASK; > > - } > > + if (!pdata) > > + return -EINVAL; > > + > > + gpio->max_ngpios = pdata->max_ngpios; > > + pin_mask = pdata->pin_mask; > > Hmm, okay, maybe just re-order the patches so this commit comes before the previous one. That way we don't immediately rip out this condition that we just introduced in the previous patch. > > I think I suggested squashing it into the previous patch, but with the removal of the comments and macros I think it's worth leaving it separate, just reordered. > I was wondering if I can squash patch-05 and patch-06 into one patch as this patch(patch-06) requires macros, structures, and functions that modified in the previous patch(patch-05). Thanks, Steven > Andrew _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel