2001-07-04 12:36:57

by Tim Waugh

[permalink] [raw]
Subject: Re: parport_pc tries to load parport_serial automatically

On Wed, Jun 27, 2001 at 07:32:42AM -0300, Marcelo Tosatti wrote:

> Could you remove the request_module() from parport_pc ?

Yes.

Here is a patch against 2.4.5-ac24.

Tim.
*/

2001-07-04 Tim Waugh <[email protected]>

* drivers/parport/parport_pc.c: Don't load parport_serial.
* drivers/parport/ChangeLog: Updated.

--- linux/drivers/parport/parport_pc.c.orig Wed Jul 4 13:30:01 2001
+++ linux/drivers/parport/parport_pc.c Wed Jul 4 13:30:26 2001
@@ -2931,11 +2931,6 @@
if (ret && registered_parport)
pci_unregister_driver (&parport_pc_pci_driver);

-#ifdef CONFIG_PARPORT_SERIAL_MODULE
- if (!ret)
- request_module ("parport_serial");
-#endif
-
return ret;
}

--- linux/drivers/parport/ChangeLog.orig Wed Jul 4 13:30:32 2001
+++ linux/drivers/parport/ChangeLog Wed Jul 4 13:32:01 2001
@@ -0,0 +1,6 @@
+2001-07-04 Tim Waugh <[email protected]>
+
+ * parport_pc.c (init_module): Don't try to load parport_serial.
+ This means that the user needs to load it (or a hardware detection
+ program on their behalf) if necessary.
+


2001-07-04 12:39:06

by Tim Waugh

[permalink] [raw]
Subject: Re: parport_pc tries to load parport_serial automatically

On Wed, Jul 04, 2001 at 01:38:13PM +0100, Alan Cox wrote:

> Can hotplug handle this from a PCI id table ?

There is a PCI id table in parport_serial, yes (if that's what you're
asking).

Tim.
*/

2001-07-04 12:38:26

by Alan

[permalink] [raw]
Subject: Re: parport_pc tries to load parport_serial automatically

> -#ifdef CONFIG_PARPORT_SERIAL_MODULE
> - if (!ret)
> - request_module ("parport_serial");
> -#endif
> -
> return ret;
> }
>
> --- linux/drivers/parport/ChangeLog.orig Wed Jul 4 13:30:32 2001
> +++ linux/drivers/parport/ChangeLog Wed Jul 4 13:32:01 2001
> @@ -0,0 +1,6 @@
> +2001-07-04 Tim Waugh <[email protected]>
> +
> + * parport_pc.c (init_module): Don't try to load parport_serial.
> + This means that the user needs to load it (or a hardware detection
> + program on their behalf) if necessary.
> +

Can hotplug handle this from a PCI id table ?