Commit 2b9ed3b9 authored by Gerhard Uttenthaler's avatar Gerhard Uttenthaler Committed by Marc Kleine-Budde
Browse files

can: ems_pci: Fix code style, copyright and email address 



Fix code style complained by checkpatch.pl, add Copyright and
fix email address

Signed-off-by: default avatarGerhard Uttenthaler <uttenthaler@ems-wuensche.com>
Link: https://lore.kernel.org/all/20230120112616.6071-2-uttenthaler@ems-wuensche.com


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent e3825a30

drivers/net/can/sja1000/ems_pci.c

+20 −25
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Copyright (C) 2007 Wolfgang Grandegger <wg@grandegger.com>

 * Copyright (C) 2008 Markus Plessing <plessing@ems-wuensche.com>

 * Copyright (C) 2008 Sebastian Haas <haas@ems-wuensche.com>

 * Copyright (C) 2023 EMS Dr. Thomas Wuensche

 */



#include <linux/kernel.h>
@@ -19,7 +20,7 @@ 


#define DRV_NAME  "ems_pci"



MODULE_AUTHOR("Sebastian Haas <haas@ems-wuenche.com>");

MODULE_AUTHOR("Sebastian Haas <support@ems-wuensche.com>");

MODULE_DESCRIPTION("Socket-CAN driver for EMS CPC-PCI/PCIe/104P CAN cards");

MODULE_LICENSE("GPL v2");
@@ -40,8 +41,7 @@ struct ems_pci_card { 


#define EMS_PCI_CAN_CLOCK (16000000 / 2)



/*

 * Register definitions and descriptions are from LinCAN 0.3.3.

/* Register definitions and descriptions are from LinCAN 0.3.3.

 *

 * PSB4610 PITA-2 bridge control registers

 */
@@ -52,8 +52,7 @@ struct ems_pci_card { 
#define PITA2_MISC          0x1c	/* Miscellaneous Register */

#define PITA2_MISC_CONFIG   0x04000000	/* Multiplexed parallel interface */



/*

 * Register definitions for the PLX 9030

/* Register definitions for the PLX 9030

 */

#define PLX_ICSR            0x4c   /* Interrupt Control/Status register */

#define PLX_ICSR_LINTI1_ENA 0x0001 /* LINTi1 Enable */
@@ -62,8 +61,7 @@ struct ems_pci_card { 
#define PLX_ICSR_ENA_CLR    (PLX_ICSR_LINTI1_ENA | PLX_ICSR_PCIINT_ENA | \

			     PLX_ICSR_LINTI1_CLR)



/*

 * The board configuration is probably following:

/* The board configuration is probably following:

 * RX1 is connected to ground.

 * TX1 is not connected.

 * CLKO is not connected.
@@ -72,8 +70,7 @@ struct ems_pci_card { 
 */

#define EMS_PCI_OCR         (OCR_TX0_PUSHPULL | OCR_TX1_PUSHPULL)



/*

 * In the CDR register, you should set CBP to 1.

/* In the CDR register, you should set CBP to 1.

 * You will probably also want to set the clock divider value to 7

 * (meaning direct oscillator output) because the second SJA1000 chip

 * is driven by the first one CLKOUT output.
@@ -100,8 +97,7 @@ static const struct pci_device_id ems_pci_tbl[] = { 
};

MODULE_DEVICE_TABLE(pci, ems_pci_tbl);



/*

 * Helper to read internal registers from card logic (not CAN)

/* Helper to read internal registers from card logic (not CAN)

 */

static u8 ems_pci_v1_readb(struct ems_pci_card *card, unsigned int port)

{
@@ -146,8 +142,7 @@ static void ems_pci_v2_post_irq(const struct sja1000_priv *priv) 
	writel(PLX_ICSR_ENA_CLR, card->conf_addr + PLX_ICSR);

}



/*

 * Check if a CAN controller is present at the specified location

/* Check if a CAN controller is present at the specified location

 * by trying to set 'em into the PeliCAN mode

 */

static inline int ems_pci_check_chan(const struct sja1000_priv *priv)
@@ -185,10 +180,10 @@ static void ems_pci_del_card(struct pci_dev *pdev) 
		free_sja1000dev(dev);

	}



	if (card->base_addr != NULL)

	if (card->base_addr)

		pci_iounmap(card->pci_dev, card->base_addr);



	if (card->conf_addr != NULL)

	if (card->conf_addr)

		pci_iounmap(card->pci_dev, card->conf_addr);



	kfree(card);
@@ -202,8 +197,7 @@ static void ems_pci_card_reset(struct ems_pci_card *card) 
	writeb(0, card->base_addr);

}



/*

 * Probe PCI device for EMS CAN signature and register each available

/* Probe PCI device for EMS CAN signature and register each available

 * CAN channel to SJA1000 Socket-CAN subsystem.

 */

static int ems_pci_add_card(struct pci_dev *pdev,
@@ -222,8 +216,8 @@ static int ems_pci_add_card(struct pci_dev *pdev, 
	}



	/* Allocating card structures to hold addresses, ... */

	card = kzalloc(sizeof(struct ems_pci_card), GFP_KERNEL);

	if (card == NULL) {

	card = kzalloc(sizeof(*card), GFP_KERNEL);

	if (!card) {

		pci_disable_device(pdev);

		return -ENOMEM;

	}
@@ -248,13 +242,13 @@ static int ems_pci_add_card(struct pci_dev *pdev, 


	/* Remap configuration space and controller memory area */

	card->conf_addr = pci_iomap(pdev, 0, conf_size);

	if (card->conf_addr == NULL) {

	if (!card->conf_addr) {

		err = -ENOMEM;

		goto failure_cleanup;

	}



	card->base_addr = pci_iomap(pdev, base_bar, EMS_PCI_BASE_SIZE);

	if (card->base_addr == NULL) {

	if (!card->base_addr) {

		err = -ENOMEM;

		goto failure_cleanup;

	}
@@ -281,7 +275,7 @@ static int ems_pci_add_card(struct pci_dev *pdev, 
	/* Detect available channels */

	for (i = 0; i < max_chan; i++) {

		dev = alloc_sja1000dev(0);

		if (dev == NULL) {

		if (!dev) {

			err = -ENOMEM;

			goto failure_cleanup;

		}
@@ -325,8 +319,9 @@ static int ems_pci_add_card(struct pci_dev *pdev, 
			/* Register SJA1000 device */

			err = register_sja1000dev(dev);

			if (err) {

				dev_err(&pdev->dev, "Registering device failed "

							"(err=%d)\n", err);

				dev_err(&pdev->dev,

					"Registering device failed: %pe\n",

					ERR_PTR(err));

				free_sja1000dev(dev);

				goto failure_cleanup;

			}