Merge tag 'gpio-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux-2.6-microblaze.git] / drivers / gpio / gpio-amd8111.c

diff --git a/drivers/gpio/gpio-amd8111.c b/drivers/gpio/gpio-amd8111.c
index fdcebe5..14e6b3e 100644 (file)
--- a/drivers/gpio/gpio-amd8111.c
+++ b/drivers/gpio/gpio-amd8111.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPIO driver for AMD 8111 south bridges
  *
@@ -20,10 +21,6 @@
  * Hardware driver for Intel i810 Random Number Generator (RNG)
  * Copyright 2000,2001 Jeff Garzik <jgarzik@pobox.com>
  * Copyright 2000,2001 Philipp Rumpf <prumpf@mandrakesoft.com>
- *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 #include <linux/ioport.h>
 #include <linux/module.h>
@@ -179,7 +176,6 @@ static int __init amd_gpio_init(void)
        struct pci_dev *pdev = NULL;
        const struct pci_device_id *ent;
 
-
        /* We look for our device - AMD South Bridge
         * I don't know about a system with two such bridges,
         * so we can assume that there is max. one device.
@@ -223,11 +219,10 @@ found:
 
        spin_lock_init(&gp.lock);
 
-       printk(KERN_INFO "AMD-8111 GPIO detected\n");
+       dev_info(&pdev->dev, "AMD-8111 GPIO detected\n");
        err = gpiochip_add_data(&gp.chip, &gp);
        if (err) {
-               printk(KERN_ERR "GPIO registering failed (%d)\n",
-                      err);
+               dev_err(&pdev->dev, "GPIO registering failed (%d)\n", err);
                ioport_unmap(gp.pm);
                goto out;
        }