Remove atom field from InputInfoRec.

This field was only used in one location where we can use a local variable.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
This commit is contained in:
Peter Hutterer 2010-09-01 15:42:44 +10:00
parent 79ea9ef399
commit 9802cca816
2 changed files with 3 additions and 3 deletions

View File

@ -295,6 +295,7 @@ static DeviceIntPtr
xf86ActivateDevice(InputInfoPtr pInfo) xf86ActivateDevice(InputInfoPtr pInfo)
{ {
DeviceIntPtr dev; DeviceIntPtr dev;
Atom atom;
dev = AddInputDevice(serverClient, pInfo->device_control, TRUE); dev = AddInputDevice(serverClient, pInfo->device_control, TRUE);
@ -306,8 +307,8 @@ xf86ActivateDevice(InputInfoPtr pInfo)
return NULL; return NULL;
} }
pInfo->atom = MakeAtom(pInfo->type_name, strlen(pInfo->type_name), TRUE); atom = MakeAtom(pInfo->type_name, strlen(pInfo->type_name), TRUE);
AssignTypeAndName(dev, pInfo->atom, pInfo->name); AssignTypeAndName(dev, atom, pInfo->name);
dev->public.devicePrivate = pInfo; dev->public.devicePrivate = pInfo;
pInfo->dev = dev; pInfo->dev = dev;

View File

@ -122,7 +122,6 @@ typedef struct _InputInfoRec {
int num_valuators); int num_valuators);
int fd; int fd;
Atom atom;
DeviceIntPtr dev; DeviceIntPtr dev;
pointer private; pointer private;
char * type_name; char * type_name;