Skip to content

Commit

Permalink
staging: unisys: Convert device creation to use visor_device
Browse files Browse the repository at this point in the history 
This patch removes the legacy dev_info struct and instead creates
and passes around a traditional struct device.

This allows us to remove a lot of the various look up code and
removes the doubt if the struct exists or not.

Half of the churn is just the conversion of visorchipset_device_info
to visor_device.  Various cleanups include re-arranging the failure
paths to make more sense.

Pay attention to the create_visor_device function.  This had a lot of
churn to simplify everything.

Lots of functions disappeared because they are not needed any more.

Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
@dzickusrh @gregkh
dzickusrh authored and gregkh committed Jun 8, 2015
1 parent d32517e commit a298bc0
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 280 deletions.
8 changes: 3 additions & 5 deletions drivers/staging/unisys/include/visorbus.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct visor_device;
extern struct bus_type visorbus_type;

typedef void (*visorbus_state_complete_func) (struct visor_device *dev,
int status, void *dev_info);
int status);
struct visorchipset_state {
u32 created:1;
u32 attached:1;
Expand Down Expand Up @@ -106,11 +106,9 @@ struct visor_driver {
* fails or completes successfully.
*/
int (*pause)(struct visor_device *dev,
visorbus_state_complete_func complete_func,
void *dev_info);
visorbus_state_complete_func complete_func);
int (*resume)(struct visor_device *dev,
visorbus_state_complete_func complete_func,
void *dev_info);
visorbus_state_complete_func complete_func);

/** These fields are for private use by the bus driver only. */
struct device_driver driver;
Expand Down
146 changes: 32 additions & 114 deletions drivers/staging/unisys/visorbus/visorbus_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ static long long bus_count; /** number of bus instances */

static void chipset_bus_create(struct visor_device *bus_info);
static void chipset_bus_destroy(struct visor_device *bus_info);
static void chipset_device_create(struct visorchipset_device_info *dev_info);
static void chipset_device_destroy(struct visorchipset_device_info *dev_info);
static void chipset_device_pause(struct visorchipset_device_info *dev_info);
static void chipset_device_resume(struct visorchipset_device_info *dev_info);
static void chipset_device_create(struct visor_device *dev_info);
static void chipset_device_destroy(struct visor_device *dev_info);
static void chipset_device_pause(struct visor_device *dev_info);
static void chipset_device_resume(struct visor_device *dev_info);

/** These functions are implemented herein, and are called by the chipset
* driver to notify us about specific events.
Expand Down Expand Up @@ -184,7 +184,6 @@ visorbus_release_busdevice(struct device *xdev)

dev_set_drvdata(xdev, NULL);
kfree(dev);
kfree(xdev);
}

/** This is called when device_unregister() is called for each child
Expand Down Expand Up @@ -754,17 +753,10 @@ visordriver_probe_device(struct device *xdev)
* initialized.
*/
if (!dev->responded_to_device_create) {
struct visorchipset_device_info dev_info;

if (!visorchipset_get_device_info(dev->chipset_bus_no,
dev->chipset_dev_no,
&dev_info))
/* hmm, what to do here */
return rc;

dev->responded_to_device_create = true;
if (chipset_responders.device_create)
(*chipset_responders.device_create)(&dev_info, rc);
(*chipset_responders.device_create)(dev, rc);
}
return rc;
}
Expand Down Expand Up @@ -949,38 +941,22 @@ EXPORT_SYMBOL_GPL(visorbus_disable_channel_interrupts);
* device.
*/
static int
create_visor_device(struct visor_device *bdev,
struct visorchipset_device_info *dev_info)
create_visor_device(struct visor_device *dev)
{
int rc = -1;
struct visor_device *dev = NULL;
bool gotten = false, registered1 = false, registered2 = false;
u32 chipset_bus_no = dev_info->bus_no;
u32 chipset_dev_no = dev_info->dev_no;
u32 chipset_bus_no = dev->chipset_bus_no;
u32 chipset_dev_no = dev->chipset_dev_no;

POSTCODE_LINUX_4(DEVICE_CREATE_ENTRY_PC, chipset_dev_no, chipset_bus_no,
POSTCODE_SEVERITY_INFO);
dev = kmalloc(sizeof(*dev), GFP_KERNEL);
if (!dev) {
POSTCODE_LINUX_3(DEVICE_CREATE_FAILURE_PC, chipset_dev_no,
DIAG_SEVERITY_ERR);
goto away;
}

memset(dev, 0, sizeof(struct visor_device));
dev->visorchannel = dev_info->visorchannel;
dev->channel_type_guid = dev_info->channel_type_guid;
dev->chipset_bus_no = chipset_bus_no;
dev->chipset_dev_no = chipset_dev_no;
dev->device.parent = &bdev->device;
sema_init(&dev->visordriver_callback_lock, 1); /* unlocked */
dev->device.bus = &visorbus_type;
dev->device.groups = visorbus_dev_groups;
device_initialize(&dev->device);
dev->device.release = visorbus_release_device;
/* keep a reference just for us (now 2) */
get_device(&dev->device);
gotten = true;
dev->periodic_work =
visor_periodic_work_create(POLLJIFFIES_NORMALCHANNEL,
periodic_dev_workqueue,
Expand Down Expand Up @@ -1022,29 +998,20 @@ create_visor_device(struct visor_device *bdev,
goto away;
}

/* note: device_register is simply device_initialize + device_add */
registered1 = true;

rc = register_devmajorminor_attributes(dev);
if (rc < 0) {
POSTCODE_LINUX_3(DEVICE_REGISTER_FAILURE_PC, chipset_dev_no,
DIAG_SEVERITY_ERR);
goto away;
goto away_register;
}

registered2 = true;
rc = 0;
list_add_tail(&dev->list_all, &list_all_device_instances);
return 0;

away_register:
device_unregister(&dev->device);
away:
if (rc < 0) {
if (registered2)
unregister_devmajorminor_attributes(dev);
if (gotten)
put_device(&dev->device);
kfree(dev);
} else {
list_add_tail(&dev->list_all, &list_all_device_instances);
}
put_device(&dev->device);
return rc;
}

Expand All @@ -1057,21 +1024,6 @@ remove_visor_device(struct visor_device *dev)
device_unregister(&dev->device);
}

static struct visor_device *
find_visor_device_by_channel(struct visorchannel *channel)
{
struct list_head *listentry, *listtmp;

list_for_each_safe(listentry, listtmp, &list_all_device_instances) {
struct visor_device *dev = list_entry(listentry,
struct visor_device,
list_all);
if (dev->visorchannel == channel)
return dev;
}
return NULL;
}

static int
get_vbus_header_info(struct visorchannel *chan,
struct spar_vbus_headerinfo *hdr_info)
Expand Down Expand Up @@ -1344,25 +1296,16 @@ chipset_bus_destroy(struct visor_device *dev)
}

static void
chipset_device_create(struct visorchipset_device_info *dev_info)
chipset_device_create(struct visor_device *dev_info)
{
struct visor_device *bdev;
int rc = -1;
u32 bus_no = dev_info->bus_no;
u32 dev_no = dev_info->dev_no;
u32 bus_no = dev_info->chipset_bus_no;
u32 dev_no = dev_info->chipset_dev_no;

POSTCODE_LINUX_4(DEVICE_CREATE_ENTRY_PC, dev_no, bus_no,
POSTCODE_SEVERITY_INFO);

bdev = visorbus_get_device_by_id(bus_no, BUS_ROOT_DEVICE, NULL);
if (!bdev)
goto away;

POSTCODE_LINUX_4(DEVICE_CREATE_EXIT_PC, dev_no, bus_no,
POSTCODE_SEVERITY_INFO);

rc = create_visor_device(bdev, dev_info);
away:
rc = create_visor_device(dev_info);
if (rc < 0) {
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
POSTCODE_SEVERITY_ERR);
Expand All @@ -1375,34 +1318,21 @@ chipset_device_create(struct visorchipset_device_info *dev_info)
}

static void
chipset_device_destroy(struct visorchipset_device_info *dev_info)
chipset_device_destroy(struct visor_device *dev_info)
{
struct visor_device *dev;
int rc = -1;

dev = find_visor_device_by_channel(dev_info->visorchannel);
if (!dev)
goto away;
rc = 0;
away:
if (rc < 0)
return;
remove_visor_device(dev_info);

if (chipset_responders.device_destroy)
(*chipset_responders.device_destroy) (dev_info, rc);
remove_visor_device(dev);
(*chipset_responders.device_destroy) (dev_info, 0);
}

/* This is the callback function specified for a function driver, to
* be called when a pending "pause device" operation has been
* completed.
*/
static void
pause_state_change_complete(struct visor_device *dev, int status,
void *info)
pause_state_change_complete(struct visor_device *dev, int status)
{
struct visorchipset_device_info *dev_info = info;

if (!dev->pausing)
return;

Expand All @@ -1413,19 +1343,16 @@ pause_state_change_complete(struct visor_device *dev, int status,
/* Notify the chipset driver that the pause is complete, which
* will presumably want to send some sort of response to the
* initiator. */
(*chipset_responders.device_pause) (dev_info, status);
(*chipset_responders.device_pause) (dev, status);
}

/* This is the callback function specified for a function driver, to
* be called when a pending "resume device" operation has been
* completed.
*/
static void
resume_state_change_complete(struct visor_device *dev, int status,
void *info)
resume_state_change_complete(struct visor_device *dev, int status)
{
struct visorchipset_device_info *dev_info = info;

if (!dev->resuming)
return;

Expand All @@ -1436,22 +1363,19 @@ resume_state_change_complete(struct visor_device *dev, int status,
/* Notify the chipset driver that the resume is complete,
* which will presumably want to send some sort of response to
* the initiator. */
(*chipset_responders.device_resume) (dev_info, status);
(*chipset_responders.device_resume) (dev, status);
}

/* Tell the subordinate function driver for a specific device to pause
* or resume that device. Result is returned asynchronously via a
* callback function.
*/
static void
initiate_chipset_device_pause_resume(struct visorchipset_device_info *dev_info,
bool is_pause)
initiate_chipset_device_pause_resume(struct visor_device *dev, bool is_pause)
{
struct visor_device *dev = NULL;
int rc = -1, x;
struct visor_driver *drv = NULL;
void (*notify_func)(struct visorchipset_device_info *dev_info,
int response) = NULL;
void (*notify_func)(struct visor_device *dev, int response) = NULL;

if (is_pause)
notify_func = chipset_responders.device_pause;
Expand All @@ -1460,10 +1384,6 @@ initiate_chipset_device_pause_resume(struct visorchipset_device_info *dev_info,
if (!notify_func)
goto away;

dev = find_visor_device_by_channel(dev_info->visorchannel);
if (!dev)
goto away;

drv = to_visor_driver(dev->device.driver);
if (!drv)
goto away;
Expand All @@ -1483,8 +1403,7 @@ initiate_chipset_device_pause_resume(struct visorchipset_device_info *dev_info,
goto away;

dev->pausing = true;
x = drv->pause(dev, pause_state_change_complete,
(void *)dev_info);
x = drv->pause(dev, pause_state_change_complete);
} else {
/* This should be done at BUS resume time, but an
* existing problem prevents us from ever getting a bus
Expand All @@ -1496,8 +1415,7 @@ initiate_chipset_device_pause_resume(struct visorchipset_device_info *dev_info,
goto away;

dev->resuming = true;
x = drv->resume(dev, resume_state_change_complete,
(void *)dev_info);
x = drv->resume(dev, resume_state_change_complete);
}
if (x < 0) {
if (is_pause)
Expand All @@ -1510,18 +1428,18 @@ initiate_chipset_device_pause_resume(struct visorchipset_device_info *dev_info,
away:
if (rc < 0) {
if (notify_func)
(*notify_func)(dev_info, rc);
(*notify_func)(dev, rc);
}
}

static void
chipset_device_pause(struct visorchipset_device_info *dev_info)
chipset_device_pause(struct visor_device *dev_info)
{
initiate_chipset_device_pause_resume(dev_info, true);
}

static void
chipset_device_resume(struct visorchipset_device_info *dev_info)
chipset_device_resume(struct visor_device *dev_info)
{
initiate_chipset_device_pause_resume(dev_info, false);
}
Expand Down
Loading

0 comments on commit a298bc0

Please sign in to comment.