On Tue, 16 Oct 2007 21:54:42 -0400 Mark Lord <[EMAIL PROTECTED]> wrote:
> Fix pciehp_probe() to deal with pre-inserted ExpressCard cards, > but only when pciehp_force==1. Otherwise behaviour is unmodified. I think it would be ok to try allowing the slot to be enabled when not using pciehp_force mode. We can wrap it later if it proves to break things, however, see my comment below: > > Signed-off-by: Mark Lord <[EMAIL PROTECTED]> > --- > --- old/drivers/pci/hotplug/pciehp_ctrl.c 2007-10-16 21:14:44.000000000 > -0400 > +++ linux/drivers/pci/hotplug/pciehp_ctrl.c 2007-10-16 21:16:36.000000000 > -0400 > @@ -37,7 +37,6 @@ > #include "pciehp.h" > > static void interrupt_event_handler(struct work_struct *work); > -static int pciehp_enable_slot(struct slot *p_slot); > static int pciehp_disable_slot(struct slot *p_slot); > > static int queue_interrupt_event(struct slot *p_slot, u32 event_type) > --- old/drivers/pci/hotplug/pciehp.h 2007-10-12 12:43:44.000000000 -0400 > +++ linux/drivers/pci/hotplug/pciehp.h 2007-10-16 21:16:06.000000000 > -0400 > @@ -161,6 +161,7 @@ > extern int pciehp_unconfigure_device(struct slot *p_slot); > extern void pciehp_queue_pushbutton_work(struct work_struct *work); > int pcie_init(struct controller *ctrl, struct pcie_device *dev); > +int pciehp_enable_slot(struct slot *p_slot); > > static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 > device) > { > --- old/drivers/pci/hotplug/pciehp_core.c 2007-10-16 21:14:44.000000000 > -0400 > +++ linux/drivers/pci/hotplug/pciehp_core.c 2007-10-16 21:15:56.000000000 > -0400 > @@ -477,7 +477,8 @@ > rc = t_slot->hpc_ops->power_off_slot(t_slot); > if (rc) > goto err_out_free_ctrl_slot; > - } > + } else if (pciehp_force) > + pciehp_enable_slot(t_slot); Here it seems like what you want to do just go ahead and try to call pciehp_enable_slot always, but check the return value. If an adapter is not present, it will return -ENODEV, and then you can check to see if you have the ability to power off the slot, and try to power it off. Please fix CodingStyle issues too. > > return 0; > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Splunk Inc. > Still grepping through log files to find problems? Stop. > Now Search log events and configuration files using AJAX and a browser. > Download your FREE copy of Splunk now >> http://get.splunk.com/ > _______________________________________________ > Pcihpd-discuss mailing list > [EMAIL PROTECTED] > https://lists.sourceforge.net/lists/listinfo/pcihpd-discuss > - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/