mtd: onenand: Simplify with dev_err_probe()
Subsystems (8)
PATCH 1/6 mtd: onenand: Simplify with dev_err_probe()
Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
--- drivers/mtd/nand/onenand/onenand_omap2.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/mtd/nand/onenand/onenand_omap2.c +1 -4
@@ -494,11 +494,8 @@ static int omap2_onenand_probe(struct platform_device *pdev) c->int_gpiod =devm_gpiod_get_optional (dev,"int" ,GPIOD_IN );if (IS_ERR (c->int_gpiod)) { - r =PTR_ERR (c->int_gpiod);/* Just try again if this happens */ -if (r != -EPROBE_DEFER ) -dev_err (dev,"error getting gpio: %d\n" , r); -return r; +return dev_err_probe (dev,PTR_ERR (c->int_gpiod),"error getting gpio\n" ); }if (c->int_gpiod) {
Signature · 6 lines
2.17.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH 3/6 mtd: rawnand: gpmi: Simplify with dev_err_probe()
Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
--- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +2 -4
@@ -1003,10 +1003,8 @@ static int acquire_dma_channels(struct gpmi_nand_data *this)/* request dma channel */ dma_chan =dma_request_chan (&pdev->dev,"rx-tx" );if (IS_ERR (dma_chan)) { - ret =PTR_ERR (dma_chan); -if (ret != -EPROBE_DEFER ) -dev_err (this->dev,"DMA channel request failed: %d\n" , - ret); + ret =dev_err_probe (this->dev,PTR_ERR (dma_chan), +"DMA channel request failed\n" );release_dma_channels (this); }else { this->dma_chans[0 ] = dma_chan;
Signature · 6 lines
2.17.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH 4/6 mtd: rawnand: marvell: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiCommon pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
--- drivers/mtd/nand/raw/marvell_nand.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/mtd/nand/raw/marvell_nand.c +1 -4
@@ -2759,10 +2759,7 @@ static int marvell_nfc_init_dma(struct marvell_nfc *nfc)if (IS_ERR (nfc->dma_chan)) { ret =PTR_ERR (nfc->dma_chan); nfc->dma_chan =NULL ; -if (ret != -EPROBE_DEFER ) -dev_err (nfc->dev,"DMA channel request failed: %d\n" , - ret); -return ret; +return dev_err_probe (nfc->dev, ret,"DMA channel request failed\n" ); } r =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
Signature · 6 lines
2.17.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH 2/6 mtd: rawnand: atmel: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiCommon pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
--- drivers/mtd/nand/raw/atmel/nand-controller.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/mtd/nand/raw/atmel/nand-controller.c +3 -7
@@ -1976,13 +1976,9 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc,platform_set_drvdata (pdev, nc); nc->pmecc =devm_atmel_pmecc_get (dev); -if (IS_ERR (nc->pmecc)) { - ret =PTR_ERR (nc->pmecc); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"Could not get PMECC object (err = %d)\n" , - ret); -return ret; - } +if (IS_ERR (nc->pmecc)) +return dev_err_probe (dev,PTR_ERR (nc->pmecc), +"Could not get PMECC object\n" );if (nc->caps->has_dma && !atmel_nand_avoid_dma) {dma_cap_mask_t mask;
Signature · 6 lines
2.17.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH 5/6 mtd: rawnand: marvell: Fix and update kerneldoc
In reply to Krzysztof KozlowskiFix kerneldoc comments and add missing documentation for members to fix W=1 compile warnings like:
drivers/mtd/nand/raw/marvell_nand.c:251: warning:
cannot understand function prototype: 'struct marvell_hw_ecc_layout '
drivers/mtd/nand/raw/marvell_nand.c:342: warning:
Function parameter or member 'layout' not described in 'marvell_nand_chip'
--- drivers/mtd/nand/raw/marvell_nand.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
drivers/mtd/nand/raw/marvell_nand.c +16 -7
@@ -227,6 +227,8 @@#define XTYPE_MASK 7/** +* struct marvell_hw_ecc_layout - layout of Marvell ECC +* * Marvell ECC engine works differently than the others, in order to limit the * size of the IP, hardware engineers chose to set a fixed strength at 16 bits * per subpage, and depending on a the desired strength needed by the NAND chip,
@@ -292,6 +294,8 @@ static const struct marvell_hw_ecc_layout marvell_nfc_layouts[] = { };/** +* struct marvell_nand_chip_sel - CS line description +* * The Nand Flash Controller has up to 4 CE and 2 RB pins. The CE selection * is made by a field in NDCB0 register, and in another field in NDCB2 register. * The datasheet describes the logic with an error: ADDR5 field is once
@@ -312,14 +316,15 @@ struct marvell_nand_chip_sel { };/** -* NAND chip structure: stores NAND chip device related information +* struct marvell_nand_chip - stores NAND chip device related information * * @chip: Base NAND chip structure * @node: Used to store NAND chips into a list -* @layout NAND layout when using hardware ECC +* @layout: NAND layout when using hardware ECC * @ndcr: Controller register value for this NAND chip * @ndtr0: Timing registers 0 value for this NAND chip * @ndtr1: Timing registers 1 value for this NAND chip +* @addr_cyc: Amount of cycles needed to pass column address * @selected_die: Current active CS * @nsels: Number of CS lines required by the NAND chip * @sels: Array of CS lines descriptions
@@ -349,7 +354,8 @@ static inline struct marvell_nand_chip_sel *to_nand_sel(struct marvell_nand_chip }/** -* NAND controller capabilities for distinction between compatible strings +* struct marvell_nfc_caps - NAND controller capabilities for distinction +* between compatible strings * * @max_cs_nb: Number of Chip Select lines available * @max_rb_nb: Number of Ready/Busy lines available
@@ -372,7 +378,7 @@ struct marvell_nfc_caps { };/** -* NAND controller structure: stores Marvell NAND controller information +* struct marvell_nfc - stores Marvell NAND controller information * * @controller: Base controller structure * @dev: Parent device (used to print error messages)
@@ -383,7 +389,9 @@ struct marvell_nfc_caps {* @assigned_cs: Bitmask describing already assigned CS lines * @chips: List containing all the NAND chips attached to * this NAND controller +* @selected_chip: Currently selected target chip * @caps: NAND controller capabilities for each compatible string +* @use_dma: Whetner DMA is used * @dma_chan: DMA channel (NFCv1 only) * @dma_buf: 32-bit aligned buffer for DMA transfers (NFCv1 only) */
@@ -411,7 +419,8 @@ static inline struct marvell_nfc *to_marvell_nfc(struct nand_controller *ctrl) }/** -* NAND controller timings expressed in NAND Controller clock cycles +* struct marvell_nfc_timings - NAND controller timings expressed in NAND +* Controller clock cycles * * @tRP: ND_nRE pulse width * @tRH: ND_nRE high duration
@@ -455,8 +464,8 @@ struct marvell_nfc_timings { period_ns))/** -* NAND driver structure filled during the parsing of the ->exec_op() subop -* subset of instructions. +* struct marvell_nfc_op - filled during the parsing of the ->exec_op() +* subop subset of instructions. * * @ndcb: Array of values written to NDCBx registers * @cle_ale_delay_ns: Optional delay after the last CMD or ADDR cycle
Signature · 6 lines
2.17.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH 6/6 mtd: rawnand: qcom: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiCommon pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
--- drivers/mtd/nand/raw/qcom_nandc.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-)
drivers/mtd/nand/raw/qcom_nandc.c +8 -16
@@ -2702,10 +2702,8 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)if (IS_ERR (nandc->tx_chan)) { ret =PTR_ERR (nandc->tx_chan); nandc->tx_chan =NULL ; -if (ret != -EPROBE_DEFER ) -dev_err (nandc->dev, -"tx DMA channel request failed: %d\n" , - ret); +dev_err_probe (nandc->dev, ret, +"tx DMA channel request failed\n" ); goto unalloc; }
@@ -2713,10 +2711,8 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)if (IS_ERR (nandc->rx_chan)) { ret =PTR_ERR (nandc->rx_chan); nandc->rx_chan =NULL ; -if (ret != -EPROBE_DEFER ) -dev_err (nandc->dev, -"rx DMA channel request failed: %d\n" , - ret); +dev_err_probe (nandc->dev, ret, +"rx DMA channel request failed\n" ); goto unalloc; }
@@ -2724,10 +2720,8 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)if (IS_ERR (nandc->cmd_chan)) { ret =PTR_ERR (nandc->cmd_chan); nandc->cmd_chan =NULL ; -if (ret != -EPROBE_DEFER ) -dev_err (nandc->dev, -"cmd DMA channel request failed: %d\n" , - ret); +dev_err_probe (nandc->dev, ret, +"cmd DMA channel request failed\n" ); goto unalloc; }
@@ -2750,10 +2744,8 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)if (IS_ERR (nandc->chan)) { ret =PTR_ERR (nandc->chan); nandc->chan =NULL ; -if (ret != -EPROBE_DEFER ) -dev_err (nandc->dev, -"rxtx DMA channel request failed: %d\n" , - ret); +dev_err_probe (nandc->dev, ret, +"rxtx DMA channel request failed\n" );return ret; } }
Signature · 6 lines
2.17.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH 2/6] mtd: rawnand: atmel: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiQuoted 4 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>
Quoted 28 lines
--- drivers/mtd/nand/raw/atmel/nand-controller.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)drivers/mtd/nand/raw/atmel/nand-controller.c +3
-7@@ -1976,13 +1976,9 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc,platform_set_drvdata (pdev, nc); nc->pmecc =devm_atmel_pmecc_get (dev); -if (IS_ERR (nc->pmecc)) { - ret =PTR_ERR (nc->pmecc); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"Could not get PMECC object (err = %d)\n" , - ret); -return ret; - } +if (IS_ERR (nc->pmecc)) +return dev_err_probe (dev,PTR_ERR (nc->pmecc), +"Could not get PMECC object\n" );if (nc->caps->has_dma && !atmel_nand_avoid_dma) {dma_cap_mask_t mask;Signature · 1 line
2.17.1
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH 6/6] mtd: rawnand: qcom: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiQuoted 4 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
Re: [PATCH 5/6] mtd: rawnand: marvell: Fix and update kerneldoc
In reply to Krzysztof KozlowskiQuoted 10 lines · Krzysztof Kozlowski
Fix kerneldoc comments and add missing documentation for members to fix W=1 compile warnings like:
drivers/mtd/nand/raw/marvell_nand.c:251: warning:
cannot understand function prototype: 'structmarvell_hw_ecc_layout'
drivers/mtd/nand/raw/marvell_nand.c:342: warning:
Function parameter or member 'layout' not described in 'marvell_nand_chip'Signed-off-by Krzysztof Kozlowski <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
Re: [PATCH 4/6] mtd: rawnand: marvell: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiQuoted 4 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
Re: [PATCH 3/6] mtd: rawnand: gpmi: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiQuoted 4 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
Quoted 4 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
Re: [PATCH 2/6] mtd: rawnand: atmel: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiQuoted 5 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>Reviewed-by Alexandre Belloni <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel