On Fri. 20 Jan 2023 at 01:15, Gerhard Uttenthaler
<uttenthaler@xxxxxxxxxxxxxxxx> wrote:
>
> Added myself ass module author and fix three code style issues
^^^
A self esteem lapsus? :)
>
> Signed-off-by: Gerhard Uttenthaler <uttenthaler@xxxxxxxxxxxxxxxx>
> ---
> drivers/net/can/sja1000/ems_pci.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
> index 68fdead6ad74..5c2f4afba2d0 100644
> --- a/drivers/net/can/sja1000/ems_pci.c
> +++ b/drivers/net/can/sja1000/ems_pci.c
> @@ -21,6 +21,7 @@
> #define DRV_NAME "ems_pci"
>
> MODULE_AUTHOR("Sebastian Haas <support@xxxxxxxxxxxxxxx>");
> +MODULE_AUTHOR("Gerhard Uttenthaler <uttenthaler@xxxxxxxxxxxxxxx>");
> MODULE_DESCRIPTION("Socket-CAN driver for EMS CPC-PCI/PCIe/104P CAN cards");
> MODULE_LICENSE("GPL v2");
>
> @@ -283,7 +284,6 @@ static int ems_pci_add_card(struct pci_dev *pdev,
> conf_bar = EMS_PCI_V3_CONF_BAR;
> conf_size = EMS_PCI_V3_CONF_SIZE;
> } else if (pdev->vendor == PCI_VENDOR_ID_PLX) {
> -
This line was inadvertently added in PATCH 4/8 and is now removed
here. Fix please.
> card->version = 2; /* CPC-PCI v2 */
> max_chan = EMS_PCI_V2_MAX_CHAN;
> base_bar = EMS_PCI_V2_BASE_BAR;
> @@ -331,7 +331,8 @@ static int ems_pci_add_card(struct pci_dev *pdev,
> /* ASIX chip asserts local reset to CAN controllers
> * after bootup until it is deasserted
> */
> - writel(readl(card->conf_addr + ASIX_LIEMR) & ~ASIX_LIEMR_LRST, card->conf_addr + ASIX_LIEMR);
> + writel(readl(card->conf_addr + ASIX_LIEMR) & ~ASIX_LIEMR_LRST,
> + card->conf_addr + ASIX_LIEMR);
> }
>
> ems_pci_card_reset(card);
> @@ -392,7 +393,8 @@ static int ems_pci_add_card(struct pci_dev *pdev,
> /* Enable IRQ in AX99100 */
> writel(ASIX_LINTSR_INT0AC, card->conf_addr + ASIX_LINTSR);
> /* Enable local INT0 input enable */
> - writel(readl(card->conf_addr + ASIX_LIEMR) | ASIX_LIEMR_L0EINTEN, card->conf_addr + ASIX_LIEMR);
> + writel(readl(card->conf_addr + ASIX_LIEMR) | ASIX_LIEMR_L0EINTEN,
> + card->conf_addr + ASIX_LIEMR);
> }
>
> /* Register SJA1000 device */
> --
> 2.35.3
>
> --
> EMS Dr. Thomas Wuensche e.K.
> Sonnenhang 3
> 85304 Ilmmuenster
> HR Ingolstadt, HRA 170106
>
> Phone: +49-8441-490260
> Fax : +49-8441-81860
> http://www.ems-wuensche.com
