lkml.org 
[lkml]   [2011]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH] Input: htcpen - add #ifdef CONFIG_PNP guard for pnp_ids
    On Thu, Nov 10, 2011 at 12:24:51PM +0800, Axel Lin wrote:
    > Fix below build warning if CONFIG_PNP is disabled.
    >
    > CC drivers/input/touchscreen/htcpen.o
    > drivers/input/touchscreen/htcpen.c:50: warning: 'pnp_ids' defined but not used
    >

    Does not seem to help, How about below instead?

    Thanks.

    --
    Dmitry


    Input: htcpen - switch to DMI-based autoloading

    From: Dmitry Torokhov <dmitry.torokhov@gmail.com>

    Having module device table based on PNP id produces the following warning:

    CC drivers/input/touchscreen/htcpen.o
    drivers/input/touchscreen/htcpen.c:50: warning: 'pnp_ids' defined but not used

    This happens because it is not a PNP driver, bit rather ISA driver and
    pnp_ids table is not used anywhere. To fix this issue let's switch to
    DMI-based module table instead,

    Reported-by: Axel Lin <axel.lin@gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    ---

    drivers/input/touchscreen/htcpen.c | 7 +------
    1 files changed, 1 insertions(+), 6 deletions(-)


    diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
    index 62811de..81e3386 100644
    --- a/drivers/input/touchscreen/htcpen.c
    +++ b/drivers/input/touchscreen/htcpen.c
    @@ -47,12 +47,6 @@ static int invert_y;
    module_param(invert_y, bool, 0644);
    MODULE_PARM_DESC(invert_y, "If set, Y axis is inverted");

    -static struct pnp_device_id pnp_ids[] = {
    - { .id = "PNP0cc0" },
    - { .id = "" }
    -};
    -MODULE_DEVICE_TABLE(pnp, pnp_ids);
    -
    static irqreturn_t htcpen_interrupt(int irq, void *handle)
    {
    struct input_dev *htcpen_dev = handle;
    @@ -237,6 +231,7 @@ static struct dmi_system_id __initdata htcshift_dmi_table[] = {
    },
    { }
    };
    +MODULE_DEVICE_TABLE(dmi, htcshift_dmi_table);

    static int __init htcpen_isa_init(void)
    {

    \
     
     \ /
      Last update: 2011-11-10 06:21    [W:0.022 / U:58.804 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site