Remove superfluous Super I/O res0/res1 lines.

[coreboot.git] / src / superio / smsc / lpc47m10x / superio.c

diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index 916590d4cf2ec38e76c7f20ffb6bf7cf0b70ceb2..1cb7e7d2621571a02718b43e1a4eb60f9a23a255 100644 (file)
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -44,7 +44,7 @@ static void lpc47m10x_init(device_t dev);
 
 static void pnp_enter_conf_state(device_t dev);
 static void pnp_exit_conf_state(device_t dev);
-static void dump_pnp_device(device_t dev);
+//static void dump_pnp_device(device_t dev);
 
 struct chip_operations superio_smsc_lpc47m10x_ops = {
        CHIP_NAME("SMSC LPC47M10x Super I/O")
@@ -67,30 +67,23 @@ static struct pnp_info pnp_dev_info[] = {
        { &ops, LPC47M10X2_KBC,  PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, },
 };
 
-/**********************************************************************************/
-/*                             PUBLIC INTERFACE                                  */
-/**********************************************************************************/
-
-/*
- * Function:           enable_dev
- * Parameters:         dev - pointer to structure describing a Super I/O device
- * Return Value:       None
- * Description:        Create device structures and allocate resources to devices
- *                     specified in the pnp_dev_info array (above).
+/**
+ * Create device structures and allocate resources to devices specified in the
+ * pnp_dev_info array (above).
+ *
+ * @param dev Pointer to structure describing a Super I/O device.
  */
 static void enable_dev(device_t dev)
 {
-       pnp_enable_devices(dev, &pnp_ops,
-                          ARRAY_SIZE(pnp_dev_info),
+       pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),
                           pnp_dev_info);
 }
 
-/*
- * Function:           lpc47m10x_pnp_set_resources
- * Parameters:         dev - pointer to structure describing a Super I/O device
- * Return Value:       None
- * Description:        Configure the specified Super I/O device with the resources
- *                     (I/O space, etc.) that have been allocated for it.
+/**
+ * Configure the specified Super I/O device with the resources (I/O space,
+ * etc.) that have been allocated for it.
+ *
+ * @param dev Pointer to structure describing a Super I/O device.
  */
 static void lpc47m10x_pnp_set_resources(device_t dev)
 {
@@ -120,18 +113,18 @@ static void lpc47m10x_pnp_enable(device_t dev)
        pnp_exit_conf_state(dev);
 }
 
-/*
- * Function:           lpc47m10x_init
- * Parameters:         dev - pointer to structure describing a Super I/O device
- * Return Value:       None
- * Description:        Initialize the specified Super I/O device.
- *                     Devices other than COM ports and the keyboard controller are
- *                     ignored. For COM ports, we configure the baud rate.
+/**
+ * Initialize the specified Super I/O device.
+ *
+ * Devices other than COM ports and the keyboard controller are ignored.
+ * For COM ports, we configure the baud rate.
+ *
+ * @param dev Pointer to structure describing a Super I/O device.
  */
 static void lpc47m10x_init(device_t dev)
 {
        struct superio_smsc_lpc47m10x_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -148,52 +141,35 @@ static void lpc47m10x_init(device_t dev)
                break;
 
        case LPC47M10X2_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }
 }
 
-/**********************************************************************************/
-/*                             PRIVATE FUNCTIONS                                 */
-/**********************************************************************************/
-
-/*
- * Function:           pnp_enter_conf_state
- * Parameters:         dev - pointer to structure describing a Super I/O device
- * Return Value:       None
- * Description:        Enable access to the LPC47M10X2's configuration registers.
- */
+/** Enable access to the LPC47M10X2's configuration registers. */
 static void pnp_enter_conf_state(device_t dev)
 {
        outb(0x55, dev->path.pnp.port);
 }
 
-/*
- * Function:           pnp_exit_conf_state
- * Parameters:         dev - pointer to structure describing a Super I/O device
- * Return Value:       None
- * Description:        Disable access to the LPC47M10X2's configuration registers.
- */
+/** Disable access to the LPC47M10X2's configuration registers. */
 static void pnp_exit_conf_state(device_t dev)
 {
        outb(0xaa, dev->path.pnp.port);
 }
 
 #if 0
-/*
- * Function:           dump_pnp_device
- * Parameters:         dev - pointer to structure describing a Super I/O device
- * Return Value:       None
- * Description:        Print the values of all of the LPC47M10X2's configuration registers.
- *                     NOTE: The LPC47M10X2 must be in configuration mode when this
- *                     function is called.
+/**
+ * Print the values of all of the LPC47M10X2's configuration registers.
+ *
+ * NOTE: The LPC47M10X2 must be in config mode when this function is called.
+ *
+ * @param dev Pointer to structure describing a Super I/O device.
  */
 static void dump_pnp_device(device_t dev)
 {
        int register_index;
-       print_debug("\r\n");
+       print_debug("\n");
 
        for(register_index = 0; register_index <= LPC47M10X2_MAX_CONFIG_REGISTER; register_index++) {
                uint8_t register_value;
@@ -212,10 +188,10 @@ static void dump_pnp_device(device_t dev)
                print_debug_char(' ');
                print_debug_hex8(register_value);
                if ((register_index & 0x0f) == 0x0f) {
-                       print_debug("\r\n");
+                       print_debug("\n");
                }
        }
 
-       print_debug("\r\n");
+       print_debug("\n");
 }
 #endif